异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -334,7 +334,7 @@ class SoccerNoteListController extends Controller
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
-        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
+        // $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
         //$arr[] = 'view';
 //        if (checkRriv('/admin/SoccerNoteList/edit')) {
 //            $arr[] = 'edit';

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -46,7 +46,7 @@ class SoccerStringNoteListController extends Controller
         $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 140));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 230));
-        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
+        // $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
 //        if (checkRriv('/admin/SoccerStringNoteList/edit')) {
 //            $arr[] ='edit';
 //        }

app/Models/MoneyBuyStr.php

@@ -106,20 +106,29 @@ class MoneyBuyStr 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/SoccerStringNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerStringNoteList/invalid/?id='.$data[$i]->id.'\',\''.$data[$i]->order_id.'\');"> 作废 </a>';
-            }else if($data[$i]->status==1 && $data[$i]->settle_status==2){
-                $data[$i]->order_status = '投注';
-            }else if($data[$i]->status==2){
-                $data[$i]->order_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><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]->settle_status==1){
                 $data[$i]->settle_status = '未结算';
             }else if($data[$i]->settle_status==2){
                 $data[$i]->settle_status = '已结算';
             }
+            */
+            if($data[$i]->settle_status==1){
+                $settle_status = '未结算';
+            }else if($data[$i]->settle_status==2){
+                $settle_status = '已结算';
+            }
+            
+
+            if($data[$i]->status==1 && $data[$i]->settle_status==1){
+                $data[$i]->order_status = '投注<br>'.$settle_status.'<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerStringNoteList/invalid/?id='.$data[$i]->id.'\',\''.$data[$i]->order_id.'\');"> 作废 </a>';
+            }else if($data[$i]->status==1 && $data[$i]->settle_status==2){
+                $data[$i]->order_status = '投注<br>'.$settle_status;
+            }else if($data[$i]->status==2){
+                $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 if($data[$i]->game_status==1){

app/Models/SportsNoteList.php

@@ -77,11 +77,12 @@ 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 = '投注';
+                // $data[$i]->order_status = '投注'.'<br>';
             } else if ($data[$i]->status == 2) {
                 $data[$i]->order_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) {
@@ -97,6 +98,36 @@ class SportsNoteList extends BaseModel
             } else {
                 $data[$i]->game_status = '已处理';
             }
+            */
+             /*
+                if ($data[$i]->settle_status == 1) {
+                    $data[$i]->settle_status = '未结算';
+                } else{
+                    $data[$i]->settle_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.'<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 = '投注'.'<br>';
+                $data[$i]->order_status = '投注<br>'.$settle_status;
+
+            } else if ($data[$i]->status == 2) {
+                $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;
 
@@ -280,6 +311,7 @@ class SportsNoteList extends BaseModel
             $data[$i]->content = $data[$i]->content1 . $data[$i]->content;
 
         }
+
         return $data->toArray();
 
     }