// 预约

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

@@ -73,7 +73,10 @@ class YHCertificateAppointViewController: YHBaseViewController {
             make.left.right.bottom.equalToSuperview()
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
         }
-        
+        requestData()
+    }
+    
+    func requestData() {
         self.requetIsGoToHK { // 请求是否赴港办证选项和是否已预约过
             self.requetAppointMembers { // 请求赴港办证人员名单
                 if self.reservationToHK == 1 { // 有历史预约人员
@@ -262,6 +265,20 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
                     // 赴港办理抢号中批次
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHGrabingNumberListCell.cellReuseIdentifier, for: indexPath) as! YHGrabingNumberListCell
                     cell.listArr = self.waitList
+                    cell.cancelAppointBlock = {
+                        [weak self] groupModel in
+                        guard let self = self else { return }
+                        // 抢号中点击取消预约
+                        YHHUD.show(.progress(message: "加载中..."))
+                        self.viewModel.cancelAppoint(orderId: orderId, reservationId: groupModel.id) { success in
+                            YHHUD.hide()
+                            if !success {
+                                YHHUD.flash(message: "取消失败")
+                                return
+                            }
+                            self.requestData()
+                        }
+                    }
                     return cell
                 }
                 

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

@@ -11,16 +11,24 @@ import UIKit
 class YHGrabingNumberListCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHGrabingNumberListCell"
+    var cancelAppointBlock: ((YHAppointMemberGroupModel)->())?
     
+    let baseListTag = 9527
     var listArr: [YHAppointMemberGroupModel] = [] {
         didSet {
             listContainView.removeSubviews()
             var lastView: YHGrabingNumberListView? = nil
             for  (index, group) in listArr.enumerated() {
                 let listView = YHGrabingNumberListView(frame: .zero)
+                listView.tag = baseListTag + index
                 let chineseNum = convertNumberToChineseText(index+1)
                 listView.titleLabel.text = "第\(chineseNum)批"
                 listView.membersLabel.text = "成员：\(group.getMemberNames())"
+                listView.cancelBlock = {
+                    [weak self] in
+                    guard let self = self else { return }
+                    self.cancelAppointBlock?(group)
+                }
                 
                 // 抢号信息
                 let items1 = [YHGrabItem(type: .grab, title: "赴港时间：", detail: "抢号中"),

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

@@ -10,6 +10,8 @@ import UIKit
 
 class YHGrabingNumberListView: UIView {
 
+    var cancelBlock: (()->())?
+    
     lazy var lineView: UIView = {
         let view = UIView()
         view.backgroundColor = .separatorColor
@@ -38,6 +40,7 @@ class YHGrabingNumberListView: UIView {
         btn.layer.cornerRadius = kCornerRadius3
         btn.layer.borderWidth = 1.0
         btn.layer.borderColor = UIColor.brandMainColor.cgColor
+        btn.addTarget(self, action: #selector(didCancelBtnClicked), for: .touchUpInside)
         return btn
     }()
     
@@ -75,6 +78,10 @@ class YHGrabingNumberListView: UIView {
         createUI()
     }
     
+    @objc func didCancelBtnClicked() {
+        cancelBlock?()
+    }
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }

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

@@ -187,6 +187,31 @@ class YHCerAppointViewModel: NSObject {
             callback?(false)
         }
     }
+    
+    //
+    func cancelAppoint(orderId:Int, reservationId:Int, callback:((_ success: Bool)->())?) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.cancelAppoint
+        
+        let _ = YHNetRequest.postRequest(url: strUrl,params: ["order_id" : orderId,
+                                                              "reservation_id" : reservationId]) {
+            
+            [weak self] json, code in
+            guard let self = self else { return }
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                callback?(true)
+                
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback?(false)
+            }
+            
+        } failBlock: { err in
+            callback?(false)
+        }
+    }
 }
     
     

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -355,7 +355,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
 //            }
             
             let vc = YHCertificateAppointViewController()
-            vc.orderId = 151085
+            vc.orderId = 151090
             self.navigationController?.pushViewController(vc)
             return
         }

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

@@ -443,6 +443,8 @@ class YHAllApiName {
         static let isNeedGoHK = "super-app/order/hk/get-need-to-hk"
         // 保存是否需要赴港
         static let saveNeedGoHK = "super-app/order/hk/save-need-to-hk"
+        // 取消预约
+        static let cancelAppoint = "super-app/reservation/cancel"
 
     }