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

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

@@ -429,19 +429,9 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
-//        self.viewModel.getServicelist { success, error in
-//            let view = YHServiceSelectAlertView.alertView()
-//            view.items = self.viewModel.serviceArr
-//            view.confirmBlock = {
-//               [weak self] ids in
-//                printLog("\(ids)")
-//            }
-//            view.show()
-//        }
-        
         if 0 <= indexPath.section && indexPath.section < items1.count {
             
+            self.saveHkexpectServicOp()//for test hjl
         }
     }
     
@@ -525,6 +515,56 @@ extension YHCertificateAppointViewController {
 }
 
 extension YHCertificateAppointViewController {
+    //预约成功后调用
+    func saveHkexpectServicOp() {
+        
+        if self.orderId > 0 {
+            let key = "hkExpectService_\(self.orderId)"
+            if let value = UserDefaults.standard.value(forKey: key) {
+                printLog("已经展示过了 兄弟...")
+                return
+            }
+        }
+        
+        self.viewModel.getServicelist { success, error in
+            let view = YHServiceSelectAlertView.alertView()
+            view.items = self.viewModel.serviceArr
+            view.confirmBlock = {
+               [weak self] ids in
+                if !ids.isEmpty {
+                    
+                    var str = ""
+                    for (index,item) in ids.enumerated() {
+                        str = str + (index == 0 ? "" : ",") + String(item)
+                    }
+                    
+                    let param : [String : Any] = ["order_id":self?.orderId as Any,"ids":str]
+                    self?.saveHkexpectServic(params: param)
+                }
+            }
+            view.show()
+        }
+    }
+    
+    
+    func saveHkexpectServic(params : [String : Any]) {
+        YHHUD.show(.progress(message: "提交中..."))
+        viewModel.saveHkExpectService(params: params) { success, error in
+            YHHUD.hide()
+            if success {
+                YHHUD.flash(message: "提交成功")
+                
+                if self.orderId > 0 {
+                    let key = "hkExpectService_\(self.orderId)"
+                    UserDefaults.standard.setValue("true", forKey: key)
+                    UserDefaults.standard.synchronize()
+                }
+                
+            } else {
+                YHHUD.flash(message: "提交失败")
+            }
+        }
+    }
     
     func loadHKHolidays() {
         viewModel.getHKHolidays { success, error in

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

@@ -207,6 +207,11 @@ class YHServiceSelectAlertView: UICollectionViewCell {
                 ids.append(item.id)
             }
         }
+        
+        if ids.isEmpty {
+            YHHUD.flash(message: "至少选择一项")
+            return
+        }
         confirmBlock?(ids)
         dismiss()
     }

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

@@ -21,6 +21,32 @@ class YHCerAppointViewModel: NSObject {
     var isRequestFlag : Bool = false
     
     
+    
+    // 保存香港额外服务
+    func saveHkExpectService(params:[String : Any], callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.saveExpectServiceApi
+        
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) {
+            [weak self] json, code in
+            guard let self = self else {
+                callback?(false,nil)
+                return
+            }
+            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,nil)
+        }
+    }
+    
+    
     // 获取香港节假日
     func getHKHolidays(callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
 

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

@@ -436,9 +436,10 @@ class YHAllApiName {
     
     //赴港办证预约
     struct AppointHK {
+        // 保存香港额外服务
+        static let saveExpectServiceApi = "super-app/expect-service/save"
         // 获取香港节假日
         static let hkholidaysApi = "super-app/holiday/get"
-        
         //  所有赴港人员列表
         static let hkMembers = "super-app/order/hk/user"
         // 获取港府预约结果