补充确认收款改状态

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

@@ -245,10 +245,13 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         case 6://待发货
             btnStr = ["发货","取消订单"]
             if rowModel.pay_status == 0{
-                btnStr = ["发货","取消订单","确认收款"]
+                btnStr = ["发货","取消订单"]
                 if rowModel.goods_before_pay == 1 && orderStatus == 1{
                     btnStr = ["付款码","取消订单"]
                 }
+                if rowModel.from == 3 || rowModel.from == 5 {
+                    btnStr.append("确认收款")
+                }
             }
             if rowModel.apply_cancel == 1 {
                 btnStr = ["拒绝取消订单","同意取消订单"]
@@ -259,6 +262,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             btnStr = ["退款"]
             if rowModel.pay_status == 0 {
                 btnStr = ["确认收款","取消订单"]
+                if rowModel.from == 3 || rowModel.from == 5 {
+                    btnStr.append("确认收款")
+                }
             }
             if rowModel.apply_cancel == 1 {
                 btnStr = ["拒绝取消订单","同意取消订单"]
@@ -337,6 +343,15 @@ 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 == "确认收款"{
+            isSrueOrder = 99
+            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)
         }else if sender.titleLabel?.text == "同意取消订单"{
             isSrueOrder = 7
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
@@ -443,6 +458,17 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     
     func sureGeliAlertViewAction(sender: UIButton) {
         switch isSrueOrder {
+        case 99:
+            editPayType(["user_token":UserToken as Any,"order_id":sender.tag as Any,"is_adsale":0 as Any,"amount_type":0 as Any,"pay_type":7 as Any], success: { (data) in
+                let dataM = data as! UpDataModel
+                if dataM.code == 1 {
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+                }
+            }) { (error) in
+                
+            }
+            
+            break
         case 0:
             orderConfirm(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)

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

@@ -267,12 +267,21 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             alertView.rightBtn.tag = 1009
             self.view.window?.addSubview(alertView)
             break
-        case "确认收款","确认收到退款":
+        case "确认收款":
             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 = 1099
+            self.view.window?.addSubview(alertView)
+            break
+        case "确认收到退款":
+            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 = 1011
             self.view.window?.addSubview(alertView)
             break
@@ -1162,7 +1171,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             //               str = "待发货"
             titleArr = ["取消订单","发货"]
             if self.dataMdoel!.order_res?.pay_status == 0 {
-                titleArr = ["发货","取消订单","确认收款"]
+                titleArr = ["发货","取消订单"]
+                if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
+                    titleArr.append("确认收款")
+                }
                 if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
                     titleArr = ["付款码","取消订单"]
                 }
@@ -1175,7 +1187,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             //   str = "待收货"
             titleArr = ["退款"]
             if self.dataMdoel!.order_res?.pay_status == 0 {
-                titleArr = ["确认收款","取消订单"]
+                titleArr = ["取消订单"]
+                if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
+                    titleArr.append("确认收款")
+                }
             }
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
                 titleArr = ["拒绝取消订单","同意取消订单"]
@@ -1221,9 +1236,11 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             break
         case 10:
             //               str = "订单关闭"str = "已取消" //用户取消（预售
-//            titleArr = ["查看订单"]
+            titleArr = ["查看订单"]
             if self.dataMdoel!.order_res?.pay_status == 0 {
-                titleArr = ["确认收款"]
+                if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
+                    titleArr = ["确认收款"]
+                }
             }
             break
         case 11:
@@ -1334,6 +1351,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 self.loadData()
             }) { (error) in
                 
+            }
+        }else if sender.tag == 1099 {
+            editPayType(["user_token":UserToken as Any,"order_id":self.dataMdoel?.order_res?.order_id as Any,"is_adsale":0 as Any,"amount_type":0 as Any,"pay_type":7 as Any], success: { (data) in
+                let dataM = data as! UpDataModel
+                if dataM.code == 1 {
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+                    self.delegate?.refishingOrderDchange()
+                    self.loadData()
+                }
+            }) { (error) in
+                
             }
         }else if sender.tag == 1011{
             ConfirmRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in