异常处理

app/Models/SportsNoteList.php

@@ -401,7 +401,7 @@ class SportsNoteList extends BaseModel
             ->join('st_' . $type . '_competition', 'st_' . $type . '_competition.id', '=', 'money_buy_simplex.match_id')
             // ->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.id')
             ->join('st_' . $type . '_league', 'money_buy_simplex.lg_id', '=', 'st_' . $type . '_league.id')
-            ->select('money_buy_simplex.id', 'money_buy_simplex.account_name', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'st_' . $type . '_competition.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese', 'st_' . $type . '_league.last_time')
+            ->select('money_buy_simplex.id', 'money_buy_simplex.account_name', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id','money_buy_simplex.use_mark', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'st_' . $type . '_competition.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese', 'st_' . $type . '_league.last_time')
             ->whereIn('money_buy_simplex.roll_ratify',array(0,1))
             ->where($where)
             ->orderby('money_buy_simplex.money_time', 'desc')
@@ -445,12 +445,13 @@ class SportsNoteList extends BaseModel
 
 
         for ($i = 0; $i < count($data); $i++) {
+            /*
             if ($data[$i]->status == 1 && $data[$i]->settle_status == 1) {
                 $data[$i]->order_status = '投注' . '<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $data[$i]->id . '\',\''.$data[$i]->order_id.'\',\''.$data[$i]->name_chinese.'\');"> 作废 </a>';
             } else if ($data[$i]->status == 1 && $data[$i]->settle_status != 1) {
                 $data[$i]->order_status = '投注';
             } else if ($data[$i]->status == 2) {
-                $data[$i]->order_status = '作废';
+                $data[$i]->order_status = '作废';//
             } else if ($data[$i]->status == 3) {
                 $data[$i]->order_status = '撤单';
             }
@@ -464,6 +465,30 @@ class SportsNoteList extends BaseModel
             } else {
                 $data[$i]->game_status = '已处理';
             }
+            */
+            if ($data[$i]->settle_status == 1) {
+                $settle_status = '未结算';
+            } else{
+                $settle_status = '已结算';
+            }
+            if($data[$i]->status==1 && $data[$i]->settle_status == 1){
+                $data[$i]->order_status = '投注<br>'.$settle_status;
+            }
+            else if ($data[$i]->status == 1 && $data[$i]->settle_status != 1) {
+                // $data[$i]->order_status = '投注'.'<br>';
+                $data[$i]->order_status = '投注<br>'.$settle_status;
+
+            } else if ($data[$i]->status == 2) {
+                $data[$i]->order_status = '作废<br>'.$data[$i]->use_mark;
+                // $data[$i]->order_status = '作废<br>'.$settle_status;//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
+            } else if ($data[$i]->status == 3) {
+                $data[$i]->order_status = '撤单<br>'.$settle_status;//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已撤单 </a>';
+            }
+            if ($data[$i]->game_status == 0) {
+                $data[$i]->game_status = '未处理';
+            } else {
+                $data[$i]->game_status = '已处理';
+            }
 
             $data[$i]->league = $data[$i]->name_chinese;