调整结算

app/Lib/Settlement/SettlementWinFail.php

@@ -243,7 +243,7 @@ class SettlementWinFail
         $fun = $sval->odds_code;
         $fun2 = $sval->p_code;
 
-        if ($sval->bet_type == 1 && !isset($this->buyKeyMatchIdModels[$sval->batch_id][$vsal->match_d])) {
+        if ($sval->bet_type == 1 && !isset($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_id])) {
             throw  new \Exception('单式投注结果和对应订单关联有误!');
         }
 
@@ -255,8 +255,8 @@ class SettlementWinFail
             }
 
             //如果手动更改了结果，就用更改后的结果,否则用默认的结果
-            if ($sval->bet_type == 1 && $this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->result_flag == 1) {
-                $now_result = json_decode($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->single_result, true);
+            if ($sval->bet_type == 1 && $this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_id]->result_flag == 1) {
+                $now_result = json_decode($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_id]->single_result, true);
             } else {
                 $now_result = $this->resultModel;
             }
@@ -272,8 +272,8 @@ class SettlementWinFail
             $this->getGjDatas($sval);
 
             //如果手动更改了结果，就用更改后的结果,否则用默认的结果
-            if ($sval->bet_type == 1 && $this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->result_flag == 1) {
-                $now_result = json_decode($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->single_result, true);
+            if ($sval->bet_type == 1 && $this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_id]->result_flag == 1) {
+                $now_result = json_decode($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_id]->single_result, true);
             } else {
                 $now_result = $this->gjModel;
             }

app/Models/Stzqresult.php

@@ -11,9 +11,9 @@ class Stzqresult extends BaseModel
     function resultlist($list = 10, $page, $where = '',$orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
+            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
         } else { 
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->paginate ($list);
+            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.match_id','desc')->paginate ($list);
         }
         for ($i=0; $i < count($data); $i++) { 
             $data[$i]->newstime = date("Y-m-d H:i:s");