彭俊 6 жил өмнө
parent
commit
e6dc03e142

+ 17 - 3
Application/Api/Model/MoneyBuy.php

@@ -122,7 +122,7 @@ class MoneyBuy extends Model {
         //===end===
         
         // 获取订单记录
-        $moneyBuySpxSlt = ['batch_id', 'order_id','use_mark','status as order_status','roll_ratify'];
+        $moneyBuySpxSlt = ['batch_id', 'order_id','use_mark','status as order_status','settle_status','roll_ratify'];
         $getMoneyBuySpx = $moneyBuySpxMdl -> moneyBuySimplex($moneyBuySpxSlt, $moneyBuySpxWhere, $moneyBuySpxBetween, '', '', 1);
         // 获取全部订单id
         $moneyBuyMthOr = [];
@@ -209,7 +209,13 @@ class MoneyBuy extends Model {
                     $getMoneyBuyMth[$k]->order_status = $value['order_status'];//订单状态
                     $getMoneyBuyMth[$k]->roll_ratify = $value['roll_ratify'];//滚球投注审核状态
                     $getMoneyBuyMth[$k]->use_mark = $value['use_mark'];//处理备注
-
+                    if($value['settle_status'] > 1 and $value['status'] == 1){
+                        $getMoneyBuyMth[$k]->settle_status = 2;//结算状态 已结算
+                    }else if($value['settle_status'] == 1  and $value['status'] == 1){
+                        $getMoneyBuyMth[$k]->settle_status = 1;//结算状态 未结算                       
+                    }else if($value['status'] > 1){
+                        $getMoneyBuyMth[$k]->settle_status = -1;//结算状态 无效                  
+                    }
                 }
             }
         }
@@ -340,7 +346,7 @@ class MoneyBuy extends Model {
         // 起始查询位置
         $begin = ($currentPage - 1) * $pageSize;
         // 获取订单记录
-        $moneyBuyStrSlt = ['order_id', 'batch_id', 'gain_money', 'game_status', 'money', 'prize_money', 'money_time'];
+        $moneyBuyStrSlt = ['order_id', 'batch_id', 'gain_money','settle_status','game_status', 'money', 'prize_money', 'money_time'];
         $getMoneyBuyStr = $moneyBuyStrMdl -> moneyBuyStr($moneyBuyStrSlt, $moneyBuyStrWhere, $moneyBuyStrBetween, $begin, $pageSize, 1);
         $allCount = $moneyBuyStrMdl -> moneyBuyStrTotal($moneyBuyStrWhere, $moneyBuyStrBetween);
         // 获取全部订单id
@@ -449,6 +455,14 @@ class MoneyBuy extends Model {
                     $getMoneyBuyStr[$key]['money_buy'][] = $v;
                 }
             }
+            $getMoneyBuyStr[$key]->use_mark = $value['use_mark'];//处理备注
+            if($value['settle_status'] > 1 and $value['status'] == 1){
+                $getMoneyBuyStr[$key]->settle_status = 2;//结算状态 已结算
+            }else if($value['settle_status'] == 1  and $value['status'] == 1){
+                $getMoneyBuyStr[$key]->settle_status = 1;//结算状态 未结算                       
+            }else if($value['status'] > 1){
+                $getMoneyBuyStr[$key]->settle_status = -1;//结算状态 无效                  
+            }
         }
         // 获取记录总数
         $result['total'] = $allCount;