1.5.2上架版2.0升级版

GeliBusinessPlatform/Define/Define.swift

@@ -27,11 +27,11 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 
 //接口地址
 //test
-let SERVERCE_ImageHost = "https://z.gelifood.com/"
-let SERVERCE_HOST = "https://z.gelifood.com/admin/"
-//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
-//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
-//online
+//let SERVERCE_ImageHost = "https://z.gelifood.com/"
+//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
+let SERVERCE_ImageHost = "https://zx.gelifood.com/"
+let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
+////online
 
 //视图常量
 let IS_IPHONE_X = __CGSizeEqualToSize(CGSize(width: 375.0, height: 812.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 812.0, height: 375.0),UIScreen.main.bounds.size)||__CGSizeEqualToSize(CGSize(width: 414.0, height: 896.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 896.0, height: 414.0),UIScreen.main.bounds.size)

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -147,15 +147,16 @@ func orderStatusStrByInt(statusNumber:Int,status_d:Int,isBfPay:Int,LmIdx:Int) ->
     //订单关闭
     case 2:
         str = "交易关闭"
+        
         break
     //已取消
     case 9:
         switch status_d {
         case 91:str = "退款中"
             break
-        case 92:str = "退货中"
+        case 92:str = "退货退款中"
             break
-        default:str = "退货退款中"
+        default:str = "退货中"
             break
         }
         break

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

@@ -283,6 +283,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                 btnStr = ["拒绝取消订单","同意取消订单"]
             }
             break
+        case 9:
+            btnStr = ["查看订单"]
+            if rowModel.order_status_d == 91 && rowModel.from == 3 || rowModel.from == 5 {
+                btnStr = ["确认收到退款"]
+            }
+            if rowModel.order_status_d == 93 {
+                btnStr = ["确认收到退货"]
+            }
+            break
         case 10://已收货
             btnStr = ["退款退货"]
             if rowModel.pay_status == 0 {
@@ -295,15 +304,6 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                 btnStr.append("付款码")
             }
             break
-        case 9:
-            btnStr = ["查看订单"]
-            if rowModel.order_status_d == 91 && rowModel.from == 3 || rowModel.from == 5 {
-                btnStr = ["确认收到退款"]
-            }
-            if rowModel.order_status_d == 93 {
-                btnStr = ["确认收到退货"]
-            }
-            break
         case 11:
             btnStr = ["查看订单"]
             if rowModel.order_status_d == 111 || rowModel.order_status_d == 112 || rowModel.order_status_d == 113{
@@ -331,6 +331,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var isYuShou = false
     var isSrueOrder = 10086
     var rejectType = 10086
+    var agreeType = 10086
     func allBtnSubmit(sender: UIButton) {
         print(sender.tag)
         let rowModel = self.dataArr[sender.tag]
@@ -391,6 +392,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "同意退款" || sender.titleLabel?.text == "同意退款退货" || sender.titleLabel?.text == "同意退货"{
             isSrueOrder = 5
+            if sender.titleLabel!.text == "同意退款" {
+                agreeType = 1
+            }
+            if sender.titleLabel!.text == "同意退货"{
+                agreeType = 2
+            }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -580,7 +587,17 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }
             break
         case 5://同意退款
-            refundOrSalesReturn(["user_token":UserToken as Any,"order_id" : sender.tag as Any,"type":1 as Any], success: { (data) in
+            if agreeType == 10086 {
+                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
+                    
+                }
+                return
+            }
+            refundOrSalesReturn(["user_token":UserToken as Any,"order_id" : sender.tag as Any,"type":agreeType as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "审批成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 

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

@@ -151,6 +151,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         
         listView.register(UINib(nibName: "GLKHCell", bundle: nil), forCellReuseIdentifier: "GLKHCell")
     }
+    
+    var agreeType = 10086
+    
     //MARK: - 底部自定义方法
     @objc func bottomBtnClick(sender:UIButton){
         
@@ -280,20 +283,26 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             alertView.rightBtn.tag = 1099
             self.view.window?.addSubview(alertView)
             break
-        case "同意退款":
+        case "同意退款","同意退款退货","同意退货":
+            if sender.titleLabel!.text == "同意退款"{
+                agreeType = 1
+            }
+            if sender.titleLabel!.text == "同意退货"{
+                agreeType = 2
+            }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
-            alertView.titileLbl.text = "是否同意退款？"
+            alertView.titileLbl.text = "是否\(sender.titleLabel!.text!)？"
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = 1100
             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.titileLbl.text = "是否\(sender.titleLabel!.text!)？"
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = 1111
             self.view.window?.addSubview(alertView)
@@ -1182,9 +1191,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         switch status {
         case 0:
             //               str = "未确定" "待付款"
-            titleArr = ["修改价格","同意接单","先货后款","拒绝接单"]
+            titleArr = ["修改价格","拒绝接单","先货后款","同意接单"]
             if self.dataMdoel!.order_res?.goods_before_pay == 1 {
-                titleArr = ["修改价格","同意接单","拒绝接单"]
+                titleArr = ["修改价格","拒绝接单","同意接单"]
             }
             break
         case 1:
@@ -1201,29 +1210,29 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         case 6:
             //               str = "待发货"
             if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
-                titleArr = ["发货","取消订单并退款"]
+                titleArr = ["取消订单并退款","发货"]
                 if self.dataMdoel!.order_res?.pay_status == 0{
-                    titleArr = ["发货","取消订单","确认收款"]
+                    titleArr = ["确认收款","取消订单","发货"]
                 }
             }else{
-                titleArr = ["发货","退款"]
+                titleArr = ["退款","发货"]
                 if self.dataMdoel!.order_res?.pay_status == 0{
-                    titleArr = ["发货","取消订单"]
+                    titleArr = ["取消订单","发货"]
                 }
                 if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
-                    titleArr.append("付款码")
+                    titleArr.insert("付款码", at: 0)
                 }
             }
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
-                titleArr = ["拒绝取消订单","同意取消订单"]
+                titleArr = ["同意取消订单","拒绝取消订单"]
             }
             break
         case 7:
             //   str = "待收货"
             if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
-                titleArr = ["确认收货","退款退货","退款"]
+                titleArr = ["退款","退款退货","确认收货"]
                 if self.dataMdoel?.order_res?.pay_status == 0{//未收款
-                    titleArr = ["确认收货","确认收款","取消订单"]
+                    titleArr = ["取消订单","确认收款","确认收货"]
                 }
             }else{
                 titleArr = ["退款"]
@@ -1231,21 +1240,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     titleArr = ["取消订单"]
                 }
                 if self.dataMdoel?.order_res?.goods_before_pay == 1 && lmIdx == 1{
-                    titleArr = ["取消订单","付款码"]
+                    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.append("确认收款")
-//                }
-//                if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
-//                    titleArr = ["付款码","取消订单"]
-//                }
-//            }
+
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
-                titleArr = ["拒绝取消订单","同意取消订单"]
+                titleArr = ["同意取消订单","拒绝取消订单"]
             }
             break
         //订单完成
@@ -1297,7 +1297,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 titleArr.append("确认收款")
             }
             if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
-                titleArr.append("付款码")
+                titleArr.insert("付款码", at: 0)
             }
             
 //            if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
@@ -1310,9 +1310,19 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             //            }
             break
         case 11:
-            titleArr = ["拒绝退款","同意退款"]
+            titleArr = ["查看订单"]
+            if self.dataMdoel!.order_res?.order_status_d == 111 || self.dataMdoel!.order_res?.order_status_d == 112 || self.dataMdoel!.order_res?.order_status_d == 113{
+                titleArr = ["同意退款","拒绝退款"]
+            }
+            if self.dataMdoel!.order_res?.order_status_d == 114 || self.dataMdoel!.order_res?.order_status_d == 115 {
+                titleArr = ["同意退货","拒绝退货"]
+            }
+            if self.dataMdoel!.order_res?.order_status_d == 116 || self.dataMdoel!.order_res?.order_status_d == 117 {
+                titleArr = ["同意退款退货","拒绝退款退货"]
+            }
             break
         default:
+            titleArr = ["查看订单"]
             break
             
         }
@@ -1446,7 +1456,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 
             }
         }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
+            if agreeType == 10086 {
+                refundAndSalesReturn(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
+                    HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+                    
+                }) { (error) in
+                    
+                }
+                return
+            }
+            refundOrSalesReturn(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any ,"type":agreeType 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()