1

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -187,7 +187,7 @@ class SoccerNoteListController extends Controller
         //结算
         $SettlementOrder = new SettlementOrder();
         $settype = 1; //首次结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
         return $data;
     }
 
@@ -213,7 +213,7 @@ class SoccerNoteListController extends Controller
         //结算
         $SettlementOrder = new SettlementOrder();
         $settype = 2; //重新结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
         return $data;
     }
 

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -214,7 +214,7 @@ class SoccerStringNoteListController extends Controller
         //结算
         $SettlementOrder = new SettlementOrder();
         $settype = 1; //首次结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
         return $data;
     }
 
@@ -242,7 +242,7 @@ class SoccerStringNoteListController extends Controller
         //重新结算
         $SettlementOrder = new SettlementOrder();
         $settype = 2; //重新结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
         return  $data;
     }
 

app/Models/SportsSoccer.php

@@ -87,9 +87,9 @@ class SportsSoccer extends BaseModel {
             }else if($data[$i]->status==1){
                 $data[$i]->status = '正在进行';
             }else if($data[$i]->status==2){
-                
+                $data[$i]->status = '已结束';
             }else if($data[$i]->status==3){
-
+                $data[$i]->status = '已结算';
             }else if($data[$i]->status==4){
                 $data[$i]->status = '已作废';
             }else if($data[$i]->status==5){