接入拒绝接单，同意接单，拒绝退款，同意退款，确认用户退款到账。优化订单列表

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -202,5 +202,13 @@
 	<string>register</string>
 	<key>运单详情</key>
 	<string>Logistics/logisticsOrderDetails</string>
+	<key>拒绝退款</key>
+	<string>Order/orderRefundRefuse</string>
+	<key>确认用户退款到账</key>
+	<string>Order/ConfirmRefund</string>
+	<key>拒绝接单</key>
+	<string>Order/refuseOrder</string>
+	<key>审核同意退货退款</key>
+	<string>Order/refundAndSalesReturn</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderInterface.swift

@@ -355,3 +355,55 @@ func editLwbno(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:
     }) { (error) in
     }
 }
+
+//MARK: -- 拒绝退款
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func orderRefundRefuse(_ 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
+    }
+}
+
+//MARK: -- 确认用户退款到账
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func ConfirmRefund(_ 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
+    }
+}
+
+//MARK: -- 拒绝接单
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func refuseOrder(_ 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
+    }
+}
+
+//MARK: -- 审核同意退货退款
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func refundAndSalesReturn(_ 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/OrderManageModel/OrderListModel.swift

@@ -31,6 +31,7 @@ class OrderListDataModel: Mappable {
     var sum_amount : String? //订单价格
     var order_status : Int? //订单状态
     var order_status_d : Int? //订单详细状态
+    var goods_before_pay :Int? //是否为先货后款：0否 1是
     var order_type : Int? //订单类型 1普通2期货3团购4预售
     var pay_status : Int? //支付状态
     var pay_type : Int? //支付类型
@@ -49,6 +50,7 @@ class OrderListDataModel: Mappable {
         order_sn <- map["order_sn"]
         add_time <- map["add_time"]
         sum_amount <- map["sum_amount"]
+        goods_before_pay <- map["goods_before_pay"]
         order_status <- map["order_status"]
         order_status_d <- map["order_status_d"]
         order_type <- map["order_type"]

GeliBusinessPlatform/Model/UpDataModel.swift

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

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

@@ -39,7 +39,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         case "全部":
             orderStatus = 100
             break
-        case "待确认":
+        case "待接单":
             orderStatus = 0
             break
         case "待付款":
@@ -48,14 +48,17 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         case "待发货":
             orderStatus = 6
             break
-        case "已发货":
+        case "待收货":
             orderStatus = 7
             break
-        case "退款/货":
-            orderStatus = 5
+        case "已收货":
+            orderStatus = 10
+            break
+        case "退款退货":
+            orderStatus = 1109
             break
-        case "已取消":
-            orderStatus = 2
+        case "交易完成":
+            orderStatus = 5
             break
         default:
             break
@@ -183,8 +186,8 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         let cell = tableView.dequeueReusableCell(withIdentifier: "CGDListCell") as! CGDListCell
         let rowModel = self.dataArr[indexPath.row]
         
-//        cell.leftIcon.isHidden = true
-//        cell.nameLblLeft.constant = -15
+        //        cell.leftIcon.isHidden = true
+        //        cell.nameLblLeft.constant = -15
         if rowModel.cus_name != nil {
             cell.nameLbl.text = rowModel.cus_name
         }else{
@@ -220,15 +223,64 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         
         var btnStr:Array<String> = []
         switch rowModel.order_status {
-        case 0:
-            btnStr = ["确认订单","取消订单"]
+        case 0://待接单
+            btnStr = ["同意接单","拒绝接单"]
+            if rowModel.goods_before_pay == 1 {
+                btnStr = ["同意接单","先货后款","拒绝接单"]
+            }
             break
-        case 1:
+        case 1://待付款
+            print("rowModel == ",rowModel.shipping_status,rowModel.pay_status)
             btnStr = ["取消订单"]
+            if rowModel.shipping_status == 1 && rowModel.pay_status == 0 {
+                btnStr = ["退货"]
+            }
+            if rowModel.shipping_status == 0 && rowModel.pay_status == 12 {
+                btnStr = ["退款"]
+            }
             break
-        default:
+        case 5://交易完成
             btnStr = ["查看详情"]
             break
+        case 6://待发货
+            btnStr = ["发货","取消订单"]
+            if rowModel.pay_status == 0 {
+                btnStr = ["发货","取消订单","确认收款"]
+            }
+            break
+        case 7://待收货
+            btnStr = ["确认收货","退货退款","退款"]
+            if rowModel.pay_status == 0 {
+                btnStr = ["确认收款","取消订单","确认收货"]
+            }
+            break
+        case 10://已收货
+            
+            btnStr = ["退货退款","交易关闭"]
+            if rowModel.pay_status == 0 {
+                btnStr = ["确认收款"]
+            }
+            break
+        case 9:
+            if rowModel.from == 3 || rowModel.from == 5 {
+                btnStr = ["确认收到退款"]
+            }
+            break
+        case 11:
+            btnStr = ["查看订单"]
+            if rowModel.order_status_d == 111 || rowModel.order_status_d == 112 || rowModel.order_status_d == 113{
+                btnStr = ["拒绝退款","同意退款"]
+            }
+            if rowModel.order_status_d == 114 || rowModel.order_status_d == 115 {
+                btnStr = ["拒绝退货","同意退货"]
+            }
+            if rowModel.order_status_d == 116 || rowModel.order_status_d == 117 {
+                btnStr = ["拒绝退款退货","同意退款退货"]
+            }
+            break
+        default:
+            btnStr = ["查看订单"]
+            break
         }
         if rowModel.order_status! == 1 {
             btnStr.append("付款码")
@@ -238,24 +290,76 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         cell.dataArr = rowModel.order_goods
         return cell
     }
- 
-    var isSrueOrder = false
+    var isYuShou = false
+    var isSrueOrder = 10086
+    var rejectType = 10086
     func allBtnSubmit(sender: UIButton) {
         print(sender.tag)
         let rowModel = self.dataArr[sender.tag]
-        if sender.titleLabel?.text == "确认订单" {
-            isSrueOrder = true
+        if sender.titleLabel?.text == "同意接单" {
+            isSrueOrder = 0
             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.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 = 2
+            
+            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 = 3
+            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 == "同意退款" || 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)
+        }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)
+        }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)
         }else if sender.titleLabel?.text == "取消订单" {
-            isSrueOrder = false
+            isSrueOrder = 1
             
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
@@ -279,11 +383,11 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             vc.orderId = rowModel.order_id!
             self.navigationController?.pushViewController(vc, animated: true)
         }
-        
     }
-    func sureGeliAlertViewAction(sender: UIButton) {
-        if isSrueOrder {
     
+    func sureGeliAlertViewAction(sender: UIButton) {
+        switch isSrueOrder {
+        case 0:
             orderConfirm(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
@@ -291,9 +395,8 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }) { (error) in
                 
             }
-        }else{
-           
-            
+            break
+        case 1:
             orderCancel(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "取消成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
@@ -303,9 +406,75 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }) { (error) in
                 
             }
+            break
+        case 2:
+            refuseOrder(["user_token":UserToken as Any,"order_id" : sender.tag 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 3:
+            orderRefund(["user_token":UserToken as Any,"order_id" : sender.tag 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 4:
+            if isYuShou {
+                sendOutAd(["user_token":UserToken as Any,"order_id" : sender.tag 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
+                    
+                }
+            }else{
+                sendOut(["user_token":UserToken as Any,"order_id" : sender.tag 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 5://同意退款
+            refundAndSalesReturn(["user_token":UserToken as Any,"order_id" : sender.tag 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 6://拒绝退款
+            var type = 1
+            if rejectType == 114 && rejectType == 115 {
+                type = 2
             }
+            if rejectType == 116 && rejectType == 117  {
+                type = 3
+            }
+            orderRefundRefuse(["user_token":UserToken as Any,"order_id" : sender.tag as Any,"type":type 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:
+            break
+        }
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         print(indexPath)
@@ -313,6 +482,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         let vc = OrderDViewController()
         vc.delegate = self
         vc.orderId = rowModel.order_id!
+        
         self.navigationController?.pushViewController(vc, animated: true)
     }
     func refishingOrderDchange() {

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

@@ -12,21 +12,23 @@ import Parchment
 class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBarViewDelegate, PagingViewControllerDelegate, OrderSelectMoreViewDelegate{
     fileprivate let cities = [
         "全部",
-        "待确认",
+        "待接单",
         "待付款",
         "待发货",
-        "已发货",
-        "退款/货",
-        "已取消"
+        "待收货",
+        "已收货",
+        "退款退货",
+        "交易完成"
     ]
     let viewControllers = [
         OrderListVC(title: "全部"),
-        OrderListVC(title: "待确认"),
+        OrderListVC(title: "待接单"),
         OrderListVC(title: "待付款"),
         OrderListVC(title: "待发货"),
-        OrderListVC(title: "已发货"),
-        OrderListVC(title: "退款/货"),
-        OrderListVC(title: "已取消")
+        OrderListVC(title: "待收货"),
+        OrderListVC(title: "已收货"),
+        OrderListVC(title: "退款退货"),
+        OrderListVC(title: "交易完成")
     ]
     var searchV : SearchBarView? = nil
     @IBOutlet weak var contentView: UIView!
@@ -85,7 +87,6 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
     //MARK:--jpushServiceNotification
     @objc func jpushServiceNotification(notion:Notification) {
         let dict = notion.userInfo! as NSDictionary
-         print("123123 ==",dict.allKeys)
         let vc = MsgCenterViewController()
         self.navigationController?.pushViewController(vc, animated: true)
     }

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

@@ -191,7 +191,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             alertView.rightBtn.tag = 1002
             self.view.window?.addSubview(alertView)
             break
-        case "直接发货":
+        case "发货":
             
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
@@ -1078,60 +1078,77 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         switch status {
         case 0:
             //               str = "未确定" "待付款"
-            titleArr = ["修改价格","打印","确认订单","取消订单"]
+            titleArr = ["修改价格","拒绝接单","同意接单","先货后款"]
             break
         case 1:
             //               str = "已确定" "待付款"
-            titleArr = ["修改价格","打印","付款码","取消订单"]
+            titleArr = ["修改价格","付款码","取消订单"]
+            if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status == 0 {
+                titleArr = ["修改价格","付款码","退货"]
+            }
+            if self.dataMdoel!.order_res?.shipping_status == 0 && self.dataMdoel!.order_res?.pay_status == 12 {
+                titleArr = ["修改价格","付款码","退款"]
+            }
             break
         case 6:
             //               str = "待发货"
-            titleArr = ["直接发货","打印","退款"]
-            
+            titleArr = ["发货","取消订单"]
+            if self.dataMdoel!.order_res?.pay_status == 0 {
+                titleArr = ["发货","取消订单","确认收款"]
+            }
             break
         case 7:
             //   str = "待收货"
-            if self.dataMdoel?.order_res?.pay_status != 2 &&  self.dataMdoel?.order_res?.pay_status != 11  {
-                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
-                    titleArr = ["退货","打印","退款"]
-                    
-                }else{
-                    titleArr = ["打印","退款"]
-                    
-                }
-                
-                
-            }else{
-                titleArr = ["打印","退款"]
+            titleArr = ["确认收货","退货退款","退款"]
+            if self.dataMdoel!.order_res?.pay_status == 0 {
+                titleArr = ["确认收款","取消订单","确认收货"]
             }
             break
         //订单完成
         case 5:
             //               str = "订单完成"
-            if status_d == 53 {
-                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
-                    titleArr = ["退货","打印","退款"]
+//            titleArr = ["删除订单"]
             
-                }else{
-                    titleArr = ["打印","退款"]
-                }
-            }else if status_d == 52{
-                titleArr = ["打印","退款"]
-            }else if status_d == 51 {
-                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
-                    titleArr = ["退货","打印"]
             
-                }else{
-                    titleArr = []
-                }
+//            if status_d == 53 {
+//                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
+//                    titleArr = ["退货","打印","退款"]
+//
+//                }else{
+//                    titleArr = ["打印","退款"]
+//                }
+//            }else if status_d == 52{
+//                titleArr = ["打印","退款"]
+//            }else if status_d == 51 {
+//                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
+//                    titleArr = ["退货","打印"]
+//
+//                }else{
+//                    titleArr = []
+//                }
+//            }
+            break
+            case 9:
+            //       退款中
+            if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
+                titleArr = ["确认收到退款"]
             }
-            
             break
         //订单关闭
         case 8,2:
             //               str = "订单关闭"str = "已取消" //用户取消（预售
             titleArr = []
             break
+            case 10:
+            //               str = "订单关闭"str = "已取消" //用户取消（预售
+            titleArr = ["退货退款","交易关闭"]
+            if self.dataMdoel!.order_res?.pay_status == 0 {
+                titleArr = ["确认收款"]
+            }
+            break
+        case 11:
+            titleArr = ["拒绝退款","同意退款"]
+            break
         default:
             break