Merge commit '01a5ed3d' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift

@@ -172,6 +172,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
             }
+            requestDetail()
             print("index:\(index)")
         }
         
@@ -192,7 +193,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
                             self.navigationController?.popViewController()
                             return
                         }
-                        
+                        requestDetail()
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
                             if cur+1 > stepView.maxIndex {
@@ -270,6 +271,25 @@ extension YHChildInfoContainerVC {
         }
     }
     
+    func requestDetail() {
+        guard let child = child else { return }
+        if orderId <= 0 || child.detailId <= 0 {
+            print("订单号或成员ID不存在")
+            return
+        }
+        self.familyRequest.requestFamilyMemberInfo(orderId:orderId, detailId:child.detailId) { 
+            
+            [weak self] detail, error in
+            guard let self = self else { return }
+            if let detail = detail {
+                self.child = detail
+                for vcItem in stepVCs {
+                    vcItem.vc.loadInfo()
+                }
+            }
+        }
+    }
+    
     func saveInfoSilent() {
         saveInfo(isSubmit:false, isShowLoading:false, callBack:nil)
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -588,7 +588,7 @@ extension YHBrotherInfoVC {
     // 静默保存 不显示toast和loading
     func saveInfoSilent() {
         guard let brotherInfo = brotherInfo else { return }
-        if brotherInfo.id == 0 { return }
+        if brotherInfo.detailId == 0 { return }
         saveInfo(isSubmit: false, isLoading: false, callBack: nil)
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -627,7 +627,7 @@ extension YHParentInfoVC {
     // 静默保存 不显示toast和loading
     func saveInfoSilent() {
         guard let parentInfo = parentInfo else { return }
-        if parentInfo.id == 0 { return }
+        if parentInfo.detailId == 0 { return }
         saveInfo(isSubmit: false, isLoading: false, callBack: nil)
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -190,6 +190,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
             }
+            requestDetail()
             print("index:\(index)")
         }
         
@@ -233,7 +234,10 @@ extension YHSpouseInfoContainerVC {
     }
     
     func saveInfoSilent() {
-        saveInfo(isSubmit: false, isLoading: false, callBack: nil)
+        saveInfo(isSubmit: false, isLoading: false) {
+           [weak self] success in
+           
+        }
     }
     
     
@@ -249,7 +253,7 @@ extension YHSpouseInfoContainerVC {
                             self.navigationController?.popViewController()
                             return
                         }
-                        
+                        requestDetail()
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
                             if cur+1 > stepView.maxIndex {
@@ -264,16 +268,20 @@ extension YHSpouseInfoContainerVC {
     }
     
     func requestDetail() {
-//        if orderId <= 0 || spouse.id <= 0 {
-//            print("订单号或成员id不存在")
-//            return
-//        }
-//        self.familyRequest.requestFamilyMemberInfo(orderId:orderId, detailId:spouse.id) { 
-//            [weak self] detail, error in
-//            if let detail = detail {
-//                spouse = detail
-//            }
-//        }
+        if orderId <= 0 {
+            print("订单号不存在")
+            return
+        }
+        self.familyRequest.requestFamilyMemberDetailInfo(memberType:.spouse, orderId:orderId) { 
+            [weak self] detail in
+            guard let self = self else { return }
+            if let detail = detail {
+                self.spouse = detail
+                for vcItem in stepVCs {
+                    vcItem.vc.loadInfo()
+                }
+            }
+        }
     }
     
     // 【WARNING!】步骤step和在数组中的下标有时候并不是一一对应

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -235,14 +235,14 @@ extension YHFamilyMemberInfoListVC {
     // 请求家庭成员信息
     func requestFamilyInfo() {
         
-        self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] success, error in
+        self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] detail, error in
             guard let self = self else { return }
-            if success {
-                familyMemberInfo = self.familyRequest.familyInfo
+            if let detail = detail {
+                familyMemberInfo = detail
             }
             loadFamilyMember()
         }
-    }
+    }     
     
     // 添加兄弟姐妹子女
     func addFamilyMember(_ type:YHFamilyMemberType) {
@@ -439,7 +439,7 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
                             
                             if !sure { return }
                             
-                            self.deleteFamilyMember(orderId: self.orderId, memberId:child.id) {
+                            self.deleteFamilyMember(orderId: self.orderId, memberId:child.detailId) {
                                 [weak self] success in
                                 guard let self = self else { return }
                                 
@@ -467,7 +467,7 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
                             
                             if !sure { return }
                             
-                            self.deleteFamilyMember(orderId: self.orderId, memberId:brother.id) {
+                            self.deleteFamilyMember(orderId: self.orderId, memberId:brother.detailId) {
                                 [weak self] success in
                                 guard let self = self else { return }
                                 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -587,7 +587,7 @@ enum YHFamilyMemberType: Int {
 
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
-    var id: Int = 0
+    var detailId: Int = 0
     var nationality: String = ""
     var orderId: Int = 0
     var relation: String = ""
@@ -675,7 +675,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     }
 
     enum CodingKeys: String, CodingKey {
-        case id = "id"
+        case detailId = "id"
         case deceased = "deceased"
         case custody = "custody"
         case nationality = "nationality"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -9,10 +9,8 @@
 
 class YHFamilyRequestViewModel {
     
-    var familyInfo:YHFamilyMemberGroupInfo?
-
     //请求所有家庭成员信息
-     func getFamilyInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+     func getFamilyInfo(params:[String:Any], callBackBlock:@escaping (_ listInfo: YHFamilyMemberGroupInfo?,_ error:YHErrorModel?)->()) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
          
@@ -28,19 +26,19 @@ class YHFamilyRequestViewModel {
             
             if code == NetWorkCode.success.rawValue {
                 guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
-                    callBackBlock(false, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
+                    callBackBlock(nil, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
                     return
                 }
-                familyInfo = resultModel.checkDefaultValue()
-                callBackBlock(true,nil)
+                _ = resultModel.checkDefaultValue()
+                callBackBlock(resultModel, nil)
                 
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, error)
+                callBackBlock(nil, error)
             }
             
         } failBlock: { err in
-            callBackBlock(false,err)
+            callBackBlock(nil, err)
         }
     }
     
@@ -141,4 +139,23 @@ class YHFamilyRequestViewModel {
             callBackBlock(nil, err)
         }
     }
+    
+    // memberType 只能传 父亲、母亲、配偶
+    func requestFamilyMemberDetailInfo(memberType:YHFamilyMemberType, orderId:Int, callBack:((_ detail:YHFamilyMember?)->Void)?) {
+        
+        let params:[String:Any] =  ["order_id": orderId]
+        self.getFamilyInfo(params:params) { 
+            [weak self] listInfo, error in
+            guard let callBack = callBack else { return }
+            if let listInfo = listInfo {
+                if memberType == .spouse {
+                    callBack(listInfo.spouse)
+                } else if memberType == .father {
+                    callBack(listInfo.father)
+                } else if memberType == .mother {
+                    callBack(listInfo.mother)
+                }
+            }
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift

@@ -172,7 +172,7 @@ extension YHOtherSelecteItemView {
             block?(true,"至今")
             textField.placeholder = ""
         } else {
-            block?(false,"")//for test hjl
+            block?(false,"")
             textField.placeholder = "请选择"
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -656,8 +656,23 @@ private extension YHPreviewViewModel {
             //家庭背景
             if let model = basiceInfoPreviewModel?.background {
                 let answer0 = model.background_member?.has == "Y" ? "满足" : "不满足"
-                let remark0 = answer0 == "满足" ? (model.background_member?.info ?? "") : nil
                 
+                var msg = ""
+                if answer0.contains("满足") {
+                    if let str = model.background_member?.info,str.isEmpty == false {
+                        if model.subset.isEmpty == false {
+                            for item in model.subset {
+                                let ttt = String(item.id)
+                                if ttt.contains(str) {
+                                    msg = item.subset_name
+                                    break
+                                }
+                            }
+                        }
+                    }
+                    msg = msg.defaultStringIfEmpty()
+                }
+                let remark0 = answer0 == "满足" ? msg : nil
                 let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、至少一名直系家庭成员（已婚配偶、父母、兄弟姐妹、子女）是现居于香港的香港永久性居民", answer:answer0,remark: remark0) //需要完善 for test hjl todo???
                 let arr = [tmp0]
                 let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "家庭背景", cellData0: arr)