完善状态逻辑

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -126,14 +126,19 @@ func orderStatusStrByInt(statusNumber:Int,status_d:Int,isBfPay:Int,LmIdx:Int) ->
         break
     case 6:
         str = "待发货"
-        if LmIdx == 1 {
-            if isBfPay == 1 {
-                str = "待付款"
-            }
-        }
+//        if LmIdx == 1 {
+//            if isBfPay == 1 {
+//                str = "待付款"
+//            }
+//        }
         break
     case 7:
         str = "待收货"
+//        if LmIdx == 1 {
+//            if isBfPay == 1 {
+//                str = "待付款"
+//            }
+//        }
         break
     //订单完成
     case 5:
@@ -156,6 +161,11 @@ func orderStatusStrByInt(statusNumber:Int,status_d:Int,isBfPay:Int,LmIdx:Int) ->
         break
     case 10:
         str = "已收货"
+//        if LmIdx == 1 {
+//            if isBfPay == 1 {
+//                str = "待付款"
+//            }
+//        }
         break
     case 11:
         switch status_d {

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

@@ -235,9 +235,8 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             if rowModel.shipping_status == 1 && rowModel.pay_status == 0 {
                 btnStr = ["退货"]
             }
-            //            if rowModel.shipping_status == 0 && rowModel.pay_status == 12 {
-            //                btnStr = ["退定金"]
-            //            }
+           
+     
             break
         case 5://交易完成
             btnStr = ["查看订单"]
@@ -266,6 +265,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                     btnStr.append("确认收款")
                 }
             }
+            if rowModel.goods_before_pay == 1 && orderStatus == 1{
+                btnStr = ["付款码","取消订单"]
+            }
             if rowModel.apply_cancel == 1 {
                 btnStr = ["拒绝取消订单","同意取消订单"]
             }
@@ -277,6 +279,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                            btnStr = ["确认收款"]
                 }
             }
+            if rowModel.goods_before_pay == 1 && orderStatus == 1{
+                btnStr = ["付款码"]
+            }
             break
         case 9:
             btnStr = ["查看订单"]

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

@@ -1173,6 +1173,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status == 0 {
                 titleArr = ["修改价格","付款码","退货"]
             }
+//            if self.dataMdoel?.order_res.
             //            if self.dataMdoel!.order_res?.shipping_status == 0 && self.dataMdoel!.order_res?.pay_status == 12 {
             //                titleArr = ["修改价格","付款码","退定金"]
             //            }
@@ -1201,6 +1202,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 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 = ["拒绝取消订单","同意取消订单"]
@@ -1246,7 +1250,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             break
         case 10:
             //               str = "订单关闭"str = "已取消" //用户取消（预售
-//            titleArr = ["查看订单"]
+            if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
+                titleArr = ["付款码"]
+            }
 //            if self.dataMdoel!.order_res?.pay_status == 0 {
 //                if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
 //                    titleArr = ["确认收款"]