退款逻辑完成

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -326,5 +326,7 @@
 	<string>Order/printUrl</string>
 	<key>修改不二制油订单打印</key>
 	<string>Order/changePrintInfo</string>
+	<key>分销订单退款特殊处理</key>
+	<string>Order/fullCommissionInquiry</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderInterface.swift

@@ -516,3 +516,19 @@ func getInvoiceInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),fail
         failture(error)
     }
 }
+//MARK:--分销订单退款特殊处理
+/**
+params-key:
+
+user_token(验证token)
+order_id(订单ID)
+
+*/
+func fullCommissionInquiry(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("分销订单退款特殊处理", params, { (rep:DataResponse<fullCommissionInquiryModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -379,3 +379,28 @@ class OrderDetailReceivingModel: Mappable {
         addr_str <- map["addr_str"]
     }
 }
+//分销订单退款特殊处理
+class fullCommissionInquiryModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : fullCommissionDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class fullCommissionDataModel: Mappable {
+    var sufficient_code:Int?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        sufficient_code <- map["sufficient_code"]
+    }
+}

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

@@ -352,8 +352,17 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var rejectType = 10086
     var agreeType = 10086
     func allBtnSubmit(sender: UIButton) {
-        print(sender.tag)
+        print("title == ",sender.tag,sender.titleLabel?.text)
         let rowModel = self.dataArr[sender.tag]
+        if rowModel.order_type == 5 && ((sender.titleLabel?.text?.contains("退款")) == true) {
+            let vc = OrderDViewController()
+            vc.delegate = self
+            vc.orderId = 12732
+            vc.order_type = rowModel.order_type
+            vc.lmIdx = orderStatus
+            self.navigationController?.pushViewController(vc, animated: true)
+            return
+        }
         if sender.titleLabel?.text == "同意接单" {
             isSrueOrder = 0
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
@@ -377,10 +386,10 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             isSrueOrder = 3
             var content = "暂不支持原路退款，请注意使用其他渠道退还金额"
             var remind = "继续退款"
-            if rowModel.commission_time_type == 1 && rowModel.order_type == 5 {
-                content = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
-                remind = "确认"
-            }
+//            if rowModel.commission_time_type == 1 && rowModel.order_type == 5 {
+//                content = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
+//                remind = "确认"
+//            }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -520,6 +529,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             let vc = OrderDViewController()
             vc.delegate = self
             vc.orderId = rowModel.order_id!
+            vc.order_type = rowModel.order_type
             vc.lmIdx = orderStatus
             self.navigationController?.pushViewController(vc, animated: true)
         }
@@ -702,6 +712,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         let vc = OrderDViewController()
         vc.delegate = self
         vc.orderId = rowModel.order_id!
+        vc.order_type = rowModel.order_type
         vc.lmIdx = orderStatus
         self.navigationController?.pushViewController(vc, animated: true)
     }

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -12,6 +12,20 @@ protocol OrderDViewControllerDelegate {
     func refishingOrderDchange()
 }
 class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate {
+    var sufficient_code = -1
+    var is_pay_own = 0
+    var order_type:Int? {
+        didSet {
+            if order_type == 5 {
+                fullCommissionInquiry(["user_token":UserToken as Any,"order_id":orderId as Any]) { [self] (data) in
+                    let model = data as! fullCommissionInquiryModel
+                    self.sufficient_code = (model.data?.sufficient_code)!
+                } failture: { (err) in
+                    
+                }
+            }
+        }
+    }
     func S_Y_View_Check_Detail(view: S_Y_View) {
         print("查看溯源")
         let browser = JXPhotoBrowser()
@@ -1662,8 +1676,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 }
             }
         }else if sender.tag == 1004 {
+            if sufficient_code == 2 {
+                is_pay_own = 1
+            }else{
+                is_pay_own = 0
+            }
             HUD.flash(.progress)
-            orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"is_pay_own":0 as Any], success: { (data) in
+            orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"is_pay_own":is_pay_own as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 self.delegate?.refishingOrderDchange()