调整串场赛事统计

Biz/Match/GetmatchData.php

@@ -418,7 +418,7 @@ class GetmatchData {
             return $leagueData;
         }
 
-        $data = $this->getMatch($source,$models,$search,$where,$time);
+        $data = $this->getMatch($source,$models,$search,$where,$time,'','','',$oddsTypeWhere);
         return $data;
     }
 
@@ -468,7 +468,7 @@ class GetmatchData {
     /**
      * 获取国家/洲 下联赛
      */
-    public function getMatch($source,$models,$search,$where,$time='',$type_code='',$s_type_code='',$game_code=''){
+    public function getMatch($source,$models,$search,$where,$time='',$type_code='',$s_type_code='',$game_code='',$oddsTypeWhere=[]){
         //国家下所有联赛
         $country = lm($models['model_league'],"Sports")
             ->leftjoin('st_area_country','st_area_country.id',$models['model_league'].'.country_id')
@@ -490,7 +490,7 @@ class GetmatchData {
             ->toArray();
 
         if($type_code != 'StChampion'){//非冠军赛事
-            $data = $this->getMatchNum($source,$country,$area,$models,$where,$search,$time,'',$s_type_code,$game_code);
+            $data = $this->getMatchNum($source,$country,$area,$models,$where,$search,$time,'',$s_type_code,$game_code,$oddsTypeWhere);
         }else{//冠军赛事
             $data = $this->getMatchStChampionNum($source,$country,$area,$models,$where,$search,$time);
         }
@@ -502,7 +502,7 @@ class GetmatchData {
      * 获取联赛下赛事 数量
      * 非冠军盘口
      */
-    public function getMatchNum($source,$country,$area,$models,$where,$search,$time='',$type=0,$s_type_code='',$game_code=''){
+    public function getMatchNum($source,$country,$area,$models,$where,$search,$time='',$type=0,$s_type_code='',$game_code='',$oddsTypeWhere=[]){
         $leagueData = lm($models['model_league'],'Sports')
             ->select('id as lg_id','name_chinese as league','country_id','area_id')
             ->where([[$models['model_league'].'.name_chinese','!=','']])
@@ -535,7 +535,7 @@ class GetmatchData {
         if(empty($matchData)) return $matchData;
 
         //===获取当前赛事是否有赔率，如果没有则去除===
-        $matchData_new = $this->commonFunction->Handle_Odds_Null($matchData,$models);
+        $matchData_new = $this->commonFunction->Handle_Odds_Null($matchData,$models,$oddsTypeWhere);
 
         //按国家
         $countryData = [];