补充同意退款，拒绝退款逻辑

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -214,5 +214,7 @@
 	<string>Order/orderCancelAudit</string>
 	<key>确认收到退货</key>
 	<string>Order/confirmReturnedGoods</string>
+	<key>审核同意退货或退款</key>
+	<string>Order/refundOrSalesReturn</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderInterface.swift

@@ -433,3 +433,16 @@ func confirmReturnedGoods(_ params:[String:Any],success:@escaping (_ res:Any)->(
     }) { (error) in
     }
 }
+
+//MARK: -- 审核同意退货或退款
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func refundOrSalesReturn(_ 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

@@ -246,7 +246,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             if rowModel.pay_status == 0{
                 btnStr = ["发货","取消订单"]
                 if rowModel.goods_before_pay == 1 && orderStatus == 1{
-                    btnStr = ["付款码","取消订单"]
+                    btnStr = ["取消订单","付款码"]
                 }
                 if rowModel.from == 3 || rowModel.from == 5 {
                     btnStr.append("确认收款")
@@ -266,7 +266,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                 }
             }
             if rowModel.goods_before_pay == 1 && orderStatus == 1{
-                btnStr = ["付款码","取消订单"]
+                btnStr = ["取消订单","付款码"]
             }
             if rowModel.apply_cancel == 1 {
                 btnStr = ["拒绝取消订单","同意取消订单"]
@@ -532,13 +532,13 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }
             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)
-//
-//            }) { (error) in
-//
-//            }
+            refundOrSalesReturn(["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)
+
+            }) { (error) in
+
+            }
             break
         case 6://拒绝退款
             var type = 1

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

@@ -283,6 +283,24 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             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 = 1100
+            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 = 1111
+        self.view.window?.addSubview(alertView)
+        break
         case "确认收到退款":
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
@@ -1378,6 +1396,30 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 }
             }) { (error) in
                 
+            }
+        }else if sender.tag == 1100 {
+            refundOrSalesReturn(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id 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.delegate?.refishingOrderDchange()
+                self.loadData()
+            }) { (error) in
+                
+            }
+        }else if sender.tag == 1111 {
+            var type = 1
+            if self.dataMdoel?.order_res?.order_status_d == 114 && self.dataMdoel?.order_res?.order_status_d == 115 {
+                type = 2
+            }
+            if self.dataMdoel?.order_res?.order_status_d == 116 && self.dataMdoel?.order_res?.order_status_d == 117  {
+                type = 3
+            }
+            orderRefundRefuse(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id 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)
+
+            }) { (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