修改串场

Application/Sports/Controller/MatchList.php

@@ -467,16 +467,16 @@ class  MatchList extends Controller {
             switch ($oddsType)
             {
                 case 'StRollBall'://滚球
-                    $oddsTypeWhere = [[$model_odds.'.is_rollball','=',1]];
+                    $oddsTypeWhere = [[$model_odds.'.is_stringscene','=',0]];
                     break;
                 case 'StSoon'://即将
-                    $oddsTypeWhere = [[$model_odds.'.is_morningplate','=',1]];
+                    $oddsTypeWhere = [[$model_odds.'.is_stringscene','=',0]];
                     break;
                 case 'StToday'://今日
-                    $oddsTypeWhere = [[$model_odds.'.is_today','=',1]];
+                    $oddsTypeWhere = [[$model_odds.'.is_stringscene','=',0]];
                     break;
                 case 'StMorningPlate'://早盘
-                    $oddsTypeWhere = [[$model_odds.'.is_morningplate','=',1]];
+                    $oddsTypeWhere = [[$model_odds.'.is_stringscene','=',0]];
                     break;
                 case 'StStringScene'://串场
                     $oddsTypeWhere = [[$model_odds.'.is_stringscene','=',1]];

Application/Sports/Model/St_bq_odds.php

@@ -31,6 +31,7 @@ class St_bq_odds extends Model
         $oddsData = self::select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
 //            ->where($source)
             ->whereIn('match_id',$match_ids)
+            ->where('is_stringscene',0)
             ->where(['type'=>0,'status'=>0])//查询滚球赔率
             ->where(function($query){
                 $query->where('odds_code','concede_home')

Application/Sports/Model/St_lq_odds.php

@@ -32,6 +32,7 @@ class St_lq_odds extends Model
 //            ->where($source)
             ->whereIn('match_id',$match_ids)
             ->where(['type'=>0,'status'=>0])//查询滚球赔率
+            ->where('is_stringscene',0)
             ->where(function($query){
                 $query->where('odds_code','concede_home')
                     ->orWhere(function($query){

Application/Sports/Model/St_wq_odds.php

@@ -31,6 +31,7 @@ class St_wq_odds extends Model
         $oddsData = self::select('match_id','id','p_code','odds_code','status','odds','condition','sort','odds_only')
 //            ->where($source)
             ->whereIn('match_id',$match_ids)
+            ->where('is_stringscene',0)
             ->where(['type'=>0,'status'=>0])//查询滚球赔率
             ->where(
                 function($query){

Application/Sports/Model/St_zq_odds.php

@@ -91,13 +91,15 @@ class St_zq_odds extends Model
 
     //获取足球赛事下 滚球盘默认赔率
     public static function getMatchOdds($source,$models,$match_ids=[]){
+        $oddsTypeWhere = [
+            [$models['model_odds'].'.is_stringscene','=',0],
+        ];
         $model_odds = $models['model_odds'];
         $oddsData= lm($model_odds,"Sports")
             ->select($model_odds.'.match_id',$model_odds.'.id','p_code','odds_code',$model_odds.'.status','odds','condition','odds_only','sort')
-//            ->where($model_odds.'.source',$source['source'])
             ->whereIn($model_odds.'.match_id',$match_ids)
             ->where([$model_odds.'.type'=>0,$model_odds.'.status'=>0])//查询滚球赔率
-            //->where($model_odds.'.expire_time','>',date("Y-m-d H:i:s"))
+            ->where($oddsTypeWhere)
             ->where(function($query)use ($model_odds){
                 $query->where($model_odds.'.odds_code','concede_home')
                     ->orWhere(function($query)use ($model_odds){

Biz/Match/GetmatchData.php

@@ -52,13 +52,13 @@ class GetmatchData {
                 break;
             case 'StSoon'://即将
                 $oddsTypeWhere = [
-                    [$models['model_odds'].'.is_morningplate','=',1],
+                    [$models['model_odds'].'.is_stringscene','=',0],
                 ];
                 $data = $this->getSoon($source,$models,$where,$lg_id,$ret,$search,$oddsTypeWhere);
                 break;
             case 'StToday'://今日
                 $oddsTypeWhere = [
-                    [$models['model_odds'].'.is_today','=',1],
+                    [$models['model_odds'].'.is_stringscene','=',0],
                 ];
                 $data = $this->getToday($source,$models,$where,$lg_id,$search,$oddsTypeWhere);
                 break;
@@ -76,7 +76,7 @@ class GetmatchData {
                     }
                 }
                 $oddsTypeWhere = [
-                    [$models['model_odds'].'.is_morningplate','=',1],
+                    [$models['model_odds'].'.is_stringscene','=',0],
                 ];
                 $data = $this->getMorningPlate($source,$models,$where,$lg_id,$search,$match_date,$oddsTypeWhere,$ret['type_code'],$ret['game_code']);
                 break;