Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -595,6 +595,7 @@
 		A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF213A2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift */; };
 		A5F886B42C61CEA700B63CF5 /* YHPictureReviewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */; };
 		A5F886B62C61F76200B63CF5 /* YHLongtapPictureSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */; };
+		A5F886BA2C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B92C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift */; };
 		A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; };
 		A5FD45232C523DD300908AD9 /* YHJsApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD45222C523DD300908AD9 /* YHJsApi.swift */; };
 		A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
@@ -1241,6 +1242,7 @@
 		A5EF213A2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQuestionAndAnswerCell.swift; sourceTree = "<group>"; };
 		A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPictureReviewManager.swift; sourceTree = "<group>"; };
 		A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLongtapPictureSheetView.swift; sourceTree = "<group>"; };
+		A5F886B92C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC.swift; sourceTree = "<group>"; };
 		A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; };
 		A5FD45222C523DD300908AD9 /* YHJsApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHJsApi.swift; sourceTree = "<group>"; };
 		A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
@@ -2234,6 +2236,7 @@
 		0472CBA62C5A11640096F48F /* CustomerService(客服段) */ = {
 			isa = PBXGroup;
 			children = (
+				A5F886B72C6242F100B63CF5 /* OfficialApprovalBatch(正式批) */,
 				0472CBA52C5A11640096F48F /* PrincipleBatch(原则批) */,
 			);
 			path = "CustomerService(客服段)";
@@ -3310,6 +3313,22 @@
 			path = "PictureReview(图片预览)";
 			sourceTree = "<group>";
 		};
+		A5F886B72C6242F100B63CF5 /* OfficialApprovalBatch(正式批) */ = {
+			isa = PBXGroup;
+			children = (
+				A5F886B82C62436A00B63CF5 /* C */,
+			);
+			path = "\U001dOfficialApprovalBatch(正式批)";
+			sourceTree = "<group>";
+		};
+		A5F886B82C62436A00B63CF5 /* C */ = {
+			isa = PBXGroup;
+			children = (
+				A5F886B92C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
 		A5FD45212C523D3200908AD9 /* InteractionH5(与H5交互) */ = {
 			isa = PBXGroup;
 			children = (
@@ -3640,6 +3659,7 @@
 				044D0BFC2C21635B00C5CF5E /* YHInformationAuthorizationStepOneViewController.swift in Sources */,
 				045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
+				A5F886BA2C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift in Sources */,
 				A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */,
 				04CE1AE12C2AD91F001CB80A /* YHActivityDetailItemView.swift in Sources */,
 				A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -17,6 +17,7 @@ class YHServiceOrderListView: YHBaseViewController {
     var type: Int = 0
     var mobile: String = ""
     var homeTableView: UITableView!
+    var orderType: Int = 0
     
     lazy var noDataView: YHEmptyDataView = {
         let view = YHEmptyDataView.createView("暂无", kEmptyCommonBgName)
@@ -35,33 +36,36 @@ class YHServiceOrderListView: YHBaseViewController {
 extension YHServiceOrderListView {
     func loadData() {
         if YHLoginManager.shared.isLogin() {
-            viewModel.getServiceCenterProgressList(orderID, type) {[weak self] success, error in
+            viewModel.getStageInformation(params: ["orderId":orderID]) {[weak self] success, error in
                 guard let self = self else { return }
-                if (self.homeTableView != nil) {
-                    if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
-                        self.homeTableView.isHidden = true
-                        self.noDataView.isHidden = false
-                    } else {
-                        self.homeTableView.isHidden = false
-                        self.noDataView.isHidden = true
-                        self.homeTableView.reloadData()
+                viewModel.getNewServiceCenterProgressList(orderID, type, orderType: self.viewModel.personInfoModel.type) {[weak self] success, error in
+                    guard let self = self else { return }
+                    if (self.homeTableView != nil) {
+                        if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
+                            self.homeTableView.isHidden = true
+                            self.noDataView.isHidden = false
+                        } else {
+                            self.homeTableView.isHidden = false
+                            self.noDataView.isHidden = true
+                            self.homeTableView.reloadData()
+                        }
                     }
-                }
-                if let block = self.block {
-                    if type == 3 {
-                        var oneflag = false
-                        var twoflag = false
-                        for item in self.viewModel.arrDataForSeviceCenterProgress {
-                            if item.type == 3 {
-                                oneflag = isNeedShowRedPointFor(key: kMyScoreRedPointInfoKey, proVersion: item.pro_version)
-                            }
-                            if item.type == 4 {
-                                twoflag = isNeedShowRedPointFor(key: kMyPlanRedPointInfoKey, proVersion: item.pro_version)
+                    if let block = self.block {
+                        if type == 3 {
+                            var oneflag = false
+                            var twoflag = false
+                            for item in self.viewModel.arrDataForSeviceCenterProgress {
+                                if item.type == 3 {
+                                    oneflag = isNeedShowRedPointFor(key: kMyScoreRedPointInfoKey, proVersion: item.pro_version)
+                                }
+                                if item.type == 4 {
+                                    twoflag = isNeedShowRedPointFor(key: kMyPlanRedPointInfoKey, proVersion: item.pro_version)
+                                }
                             }
+                            block(type, self.viewModel.arrDataForSeviceCenterProgress.count, oneflag||twoflag)
+                        } else {
+                            block(type, self.viewModel.arrDataForSeviceCenterProgress.count, false)
                         }
-                        block(type, self.viewModel.arrDataForSeviceCenterProgress.count, oneflag||twoflag)
-                    } else {
-                        block(type, self.viewModel.arrDataForSeviceCenterProgress.count, false)
                     }
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/ OfficialApprovalBatch(正式批)/C/YHOfficialApprovalResultVC.swift

+//
+//  YHOfficialApprovalResultVC.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/8/6.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+/*
+ 正式批 结果页
+ */
+
+class YHOfficialApprovalResultVC: YHBaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+    }
+}
+
+extension YHOfficialApprovalResultVC {
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHServiceCenterProgressModel.swift

@@ -23,3 +23,9 @@ class YHServiceSearchModel: YHBaseModel {
     var dictionary_code: String = ""
     var enable_flag: Int = 0
 }
+
+class YHServiceProgressModel : YHBaseModel {
+    var title : String = ""
+    var type : Int = 0
+    var list : [YHServiceCenterProgressModel] = []
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -68,6 +68,49 @@ extension YHServiceCenterMainViewModel {
         }
     }
     
+    //服务中心进度列表
+    func getNewServiceCenterProgressList(_ orderId: Int, _ type: Int, orderType: Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        
+        /*
+         orderId integer 订单id 可选
+         status integer 可选   0全部 1待开始 2进行中 3 已完成
+         let arr = ["orderId":id,"status"]
+         */
+        let params: [String : Any] = ["orderId": orderId,
+                                      "status": type]
+
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.process
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = [YHServiceProgressModel].deserialize(from: dic as? [Any]) else {
+                    callBackBlock(false,nil)
+                    return
+                }
+                var resultItem = YHServiceProgressModel()
+                for item in result {
+                    if item?.type == orderType {
+                        resultItem = item ?? YHServiceProgressModel()
+                    }
+                    
+                }
+                self.arrDataForSeviceCenterProgress = resultItem.list
+//                self.arrDataForSeviceCenterProgress = result as! [YHServiceCenterProgressModel]
+                callBackBlock(true, nil)
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callBackBlock(false,err)
+            }
+        } failBlock: { err in
+            callBackBlock(false,err)
+        }
+    }
+    
     //获取我的评分结果
     func getMyScoreDetail( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         
@@ -364,7 +407,7 @@ extension YHServiceCenterMainViewModel {
         }
     }
     
-    func getStageInformation( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+    func getStageInformation(params:[String : Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.stage
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -107,10 +107,11 @@ class YHAllApiName {
         //获取其他资料填写信息
         static let otherInfoFillApi = "infoflow/order/getOrderOtherInformation"
         //保存其他资料信息
-        static let  updateOtherInfoApi = "infoflow/order/updateOrderOtherInformation"
+        static let updateOtherInfoApi = "infoflow/order/updateOrderOtherInformation"
         
         //服务中心进度列表
         static let serviceCenterProgressApi = "infoflow/order/service-list"
+        static let process = "super-app/order/process"
         //搜索白名单
         static let bywhitelist = "infoflow/permissiondict/bywhitelist"
         static let byorderid = "infoflow/order/byorderid"