1

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -183,7 +183,7 @@ class SoccerNoteListController extends Controller
         //判断输赢
         $settlementWinFail = new SettlementWinFail();
         $res = $settlementWinFail->ProcWinInfoByOneOrder($match_id, $order_id, $bet_type);
-        return $res;
+        //return $res;
         //结算
         $SettlementOrder = new SettlementOrder();
         $settype = 1; //首次结算

app/Models/SportsNoteList.php

@@ -196,16 +196,13 @@ class SportsNoteList extends BaseModel {
                 if($data[$i]->match_status == 0 || $data[$i]->match_status == 1){
                     $data[$i]->game_status = $data[$i]->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]->match_status == 2 || $data[$i]->match_status == 5){
+                if($data[$i]->match_status == 2 || $data[$i]->match_status == 3 || $data[$i]->match_status == 5){
                     if($data[$i]->settle_status == '已结算'){
                         $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
                     }else{
                         $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
                     }
                 }
-                if($data[$i]->match_status == 3){
-                    $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
-                }
             }else{
                 $data[$i]->game_status = $data[$i]->game_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>';
             }