补充同意取消订单，拒绝取消订单及其接口

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -210,5 +210,7 @@
 	<string>Order/refuseOrder</string>
 	<key>审核同意退货退款</key>
 	<string>Order/refundAndSalesReturn</string>
+	<key>取消订单审核</key>
+	<string>Order/orderCancelAudit</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderInterface.swift

@@ -407,3 +407,16 @@ func refundAndSalesReturn(_ params:[String:Any],success:@escaping (_ res:Any)->(
     }) { (error) in
     }
 }
+
+//MARK: -- 取消订单审核
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func orderCancelAudit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) { NetworkRequest.sharedInstance.postRequest("取消订单审核", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+    }
+}

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,
 
 
 class UpDataModel: Mappable {

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -234,24 +234,30 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             if rowModel.shipping_status == 1 && rowModel.pay_status == 0 {
                 btnStr = ["退货"]
             }
-//            if rowModel.shipping_status == 0 && rowModel.pay_status == 12 {
-//                btnStr = ["退定金"]
-//            }
+            //            if rowModel.shipping_status == 0 && rowModel.pay_status == 12 {
+            //                btnStr = ["退定金"]
+            //            }
             break
         case 5://交易完成
             btnStr = ["查看详情"]
             break
         case 6://待发货
             btnStr = ["发货","取消订单"]
-            if rowModel.pay_status == 0 {
+            if rowModel.pay_status == 0{
                 btnStr = ["发货","取消订单","确认收款"]
             }
+            if rowModel.apply_cancel == 1 {
+                btnStr = ["拒绝取消订单","同意取消订单"]
+            }
             break
         case 7://待收货
             btnStr = ["确认收货","退款"]
             if rowModel.pay_status == 0 {
                 btnStr = ["确认收款","取消订单","确认收货"]
             }
+            if rowModel.apply_cancel == 1 {
+                btnStr = ["拒绝取消订单","同意取消订单"]
+            }
             break
         case 10://已收货
             
@@ -323,40 +329,55 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
-        }else if sender.titleLabel?.text == "退定金"{
-            
-            
+        }else if sender.titleLabel?.text == "同意取消订单"{
+            isSrueOrder = 7
+            let alertView = GeliAlertView(frame: self.view.window!.bounds)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            alertView.rightBtn.tag = rowModel.order_id!
+            self.view.window?.addSubview(alertView)
+        }else if sender.titleLabel?.text == "拒绝取消订单"{
+            isSrueOrder = 8
+            let alertView = GeliAlertView(frame: self.view.window!.bounds)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            alertView.rightBtn.tag = rowModel.order_id!
+            self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "同意退款" || sender.titleLabel?.text == "同意退款退货" || sender.titleLabel?.text == "同意退货"{
             isSrueOrder = 5
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
-                                  alertView.delegate = self;
-                                  alertView.tishiLbl.text = ""
-                                  alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
-                                  alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
-                                  alertView.rightBtn.tag = rowModel.order_id!
-                                  self.view.window?.addSubview(alertView)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            alertView.rightBtn.tag = rowModel.order_id!
+            self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "拒绝退款" || sender.titleLabel?.text == "拒绝退款退货" || sender.titleLabel?.text == "拒绝退货"{
             isSrueOrder = 6
             rejectType = rowModel.order_status_d!
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
-                                  alertView.delegate = self;
-                                  alertView.tishiLbl.text = ""
-                                  alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
-                                  alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
-                                  alertView.rightBtn.tag = rowModel.order_id!
-                                  self.view.window?.addSubview(alertView)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            alertView.rightBtn.tag = rowModel.order_id!
+            self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "发货" {
             isSrueOrder = 4
             if rowModel.order_type == 4 {
                 isYuShou = true
             }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
-                       alertView.delegate = self;
-                       alertView.tishiLbl.text = ""
-                       alertView.titileLbl.text = "是否发货订单？"
-                       alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
-                       alertView.rightBtn.tag = rowModel.order_id!
-                       self.view.window?.addSubview(alertView)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否发货订单？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            alertView.rightBtn.tag = rowModel.order_id!
+            self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "取消订单" {
             isSrueOrder = 1
             
@@ -467,7 +488,25 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 self.tableV.mj_header?.beginRefreshing()
             }) { (error) in
-
+                
+            }
+            break
+        case 7:
+            orderCancelAudit(["user_token":UserToken as Any,"order_id" : sender.tag as Any,"type":1 as Any], success: { (data) in
+                HUD.flash(.labeledSubSuccess(subtitle: "已同意"),delay: 1.2)
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+                self.tableV.mj_header?.beginRefreshing()
+            }) { (error) in
+                
+            }
+            break
+        case 8:
+            orderCancelAudit(["user_token":UserToken as Any,"order_id" : sender.tag as Any,"type":2 as Any], success: { (data) in
+                HUD.flash(.labeledSubSuccess(subtitle: "已拒绝"),delay: 1.2)
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+                self.tableV.mj_header?.beginRefreshing()
+            }) { (error) in
+                
             }
             break
         default: