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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  赴港
  //  赴港

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift

@@ -700,7 +700,7 @@ extension YHCertificateAppointViewController {
                 }
                 
                 // 办证地点未选
-                if groupModel.hkPlace.id <= 0 {
+                if groupModel.hkPlace.name.isEmpty {
                     groupModel.isNeedCheck = true
                     isOK = false
                 }
@@ -711,8 +711,61 @@ extension YHCertificateAppointViewController {
             return
         }
         
+        var batchs:[[String: Any]] = []
+        for group in items2 {
+            if let model = group.model {
+                var start_time = ""
+                var end_time = ""
+                if model.dateTye == 0 { // 具体时间
+                    start_time = model.detailDateStr
+                    end_time = model.detailDateStr
+                    
+                } else { // 具体时段
+                    start_time = model.startDateStr
+                    end_time = model.endDateStr
+                }
+                
+                let selectUsers = model.arr.filter {
+                    return $0.isSelected == true
+                }
+                let users = selectUsers.map {
+                    let dict = ["id" : $0.id,
+                                "type" : $0.type,
+                                "name" : $0.name] as! [String : Any]
+                    return dict
+                }
+                
+                if users.count > 0 {
+                    let batch:[String : Any] = ["start_time" : start_time,
+                                                "end_time" : end_time,
+                                                "migration_office" : model.hkPlace.name,
+                                                "users" : users]
+                    batchs.append(batch)
+                }
+            }
+        }
         
+        // 请求参数
+        let params:[String : Any] = ["order_id": orderId,
+                                     "batch": batchs]
         
+        printLog("\(params)")
+        
+//        if true {
+//            return
+//        }
+        
+        viewModel.submitAppoint(params: params) { 
+            [weak self] success, error in
+            guard let self = self else { return }
+            if success {
+                YHHUD.flash(message: "提交成功")
+                self.requestData()
+                return
+            }
+            let msg = error?.errorMsg ?? ""
+            YHHUD.flash(message: msg)
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/VM/YHCerAppointViewModel.swift

@@ -203,6 +203,29 @@ class YHCerAppointViewModel: NSObject {
         }
     }
     
+    // 提交赴港时间预约
+    
+    func submitAppoint(params:[String: Any], callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.appointResult
+        
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) { 
+             json, code in
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                callback?(true, nil)
+
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback?(false, err)
+            }
+            
+        } failBlock: { err in
+            callback?(false, err)
+        }
+    }
+    
     // 是否需要赴港
     func getIsNeedGoToHK(orderId: Int, callback:((_ needGoHK: Int, _ reservationToHK: Int)->())?) {