追加推送 5/10

Application/Sports/Controller/MatchList.php

@@ -36,6 +36,8 @@ class  MatchList extends Controller {
              ->join('st_zq_league','st_zq_league.lg_id','st_zq_competition.lg_id')
              ->where($this->commonFunction->getState('StToday'))
              ->where('st_zq_competition.source',$this->source['source'])
+             ->where('st_zq_competition.home_team','<>',null)
+             ->where('st_zq_competition.guest_team','<>',null)
              ->distinct('st_zq_competition.match_id')
              ->count('*');
         //查询明日赛事
@@ -45,6 +47,8 @@ class  MatchList extends Controller {
              ->join('st_zq_league','st_zq_league.lg_id','st_zq_competition.lg_id')
              ->where('st_zq_competition.source',$this->source['source'])
              ->where('st_zq_competition.match_date','tomorrow')
+             ->where('st_zq_competition.home_team','<>',null)
+             ->where('st_zq_competition.guest_team','<>',null)
              ->count('*');
         //受欢迎的欧洲赛事
          $data['info'][2]['name'] = '受欢迎的欧洲赛事';
@@ -57,6 +61,8 @@ class  MatchList extends Controller {
              ->where('st_zq_competition.status','<',2)
              ->where('st_zq_competition.us_time','>',qgmdate('Y-m-d H:i:s', '', -4))
              ->where('st_zq_competition.source',$this->source['source'])
+             ->where('st_zq_competition.home_team','<>',null)
+             ->where('st_zq_competition.guest_team','<>',null)
              ->count('*');
 
         //查询亚洲，澳洲赛事
@@ -74,6 +80,8 @@ class  MatchList extends Controller {
              ->where('st_zq_competition.status','<',2)
              ->where('st_zq_competition.us_time','>',qgmdate('Y-m-d H:i:s', '', -4))
              ->where('st_zq_competition.source',$this->source['source'])
+             ->where('st_zq_competition.home_team','<>',null)
+             ->where('st_zq_competition.guest_team','<>',null)
              ->count('*');
          //查询北美，南美赛事
          $data['info'][4]['name'] = '北美/南美赛事';
@@ -88,6 +96,8 @@ class  MatchList extends Controller {
             ->where('st_zq_competition.status', '<', '2')
              ->where('st_zq_competition.us_time','>',qgmdate('Y-m-d H:i:s', '', -4))
             ->where('st_area.source',$this->source['source'])
+             ->where('st_zq_competition.home_team','<>',null)
+             ->where('st_zq_competition.guest_team','<>',null)
             ->count('*');
          //国际赛事
          $data['info'][5]['name'] = '国际赛事';
@@ -99,6 +109,8 @@ class  MatchList extends Controller {
              ->where('st_zq_competition.status', '<', '2')
              ->where('st_zq_competition.us_time','>',qgmdate('Y-m-d H:i:s', '', -4))
             ->where('st_area.source',$this->source['source'])
+             ->where('st_zq_competition.home_team','<>',null)
+             ->where('st_zq_competition.guest_team','<>',null)
             ->count('*');
          return $data;
     }
@@ -117,12 +129,16 @@ class  MatchList extends Controller {
              ->where([[$st_competition.'.status', '<', '2'],
              [$st_competition.'.source',$this->source['source']]])
              ->where($st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4))
+             ->where($st_competition.'.home_team','<>',null)
+             ->where($st_competition.'.guest_team','<>',null)
              ->count('*');
          $data['info'][1]['name'] = '今日赛事';
          $data['info'][1]['code'] = 'today';
          $data['info'][1]['count']=lm($st_competition,'Sports')
              ->where($st_competition.'.source',$this->source['source'])
              ->where($this->commonFunction->getState('StToday',$st_competition))
+             ->where($st_competition.'.home_team','<>',null)
+             ->where($st_competition.'.guest_team','<>',null)
              ->count('*');
         return $data;
     }
@@ -176,7 +192,10 @@ class  MatchList extends Controller {
                     ['st_area.code','Europe'],[$st_league.'.hot',0],
                     [$st_competition.'.status', '<', '2'],
                     [$st_competition.'.source',$this->source['source']],
-                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)]
+                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)],
+                    [$st_competition.'.home_team','<>',null],
+                    [$st_competition.'.guest_team','<>',null],
+
                 ];
                 //欧洲最受欢迎的赛事
                 $data = lm($st_competition,'Sports')
@@ -193,7 +212,9 @@ class  MatchList extends Controller {
                 $where = [
                     [$st_competition.'.status', '<', '2'],
                     [$st_competition.'.source',$this->source['source']],
-                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)]
+                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)],
+                    [$st_competition.'.home_team','<>',null],
+                    [$st_competition.'.guest_team','<>',null],
                 ];
                 $Orwhere  = function ($query) {
                     $query->Orwhere('st_area.code','=','Asian')
@@ -217,7 +238,9 @@ class  MatchList extends Controller {
                 $where = [
                     [$st_competition.'.status', '<', '2'],
                     [$st_competition.'.source',$this->source['source']],
-                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)]
+                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)],
+                    [$st_competition.'.home_team','<>',null],
+                    [$st_competition.'.guest_team','<>',null],
                 ];
                 $Orwhere = function ($query) {
                     $query->Orwhere('st_area.code','=', "South_America")
@@ -240,6 +263,8 @@ class  MatchList extends Controller {
                     [$st_competition.'.match_date','tomorrow'],
                     [$st_competition.'.status',0],
                     [$st_competition.'.source',$this->source['source']],
+                    [$st_competition.'.home_team','<>',null],
+                    [$st_competition.'.guest_team','<>',null],
                 ];
                 //明日赛事
                 $data = lm($st_competition,'Sports')
@@ -256,7 +281,9 @@ class  MatchList extends Controller {
                      ['st_area.code', "world"],
                      [$st_competition.'.status','<','2'],
                      [$st_competition.'.source',$this->source['source']],
-                     [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)]
+                     [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)],
+                     [$st_competition.'.home_team','<>',null],
+                     [$st_competition.'.guest_team','<>',null],
                  ];
             //国际赛事
             $data = lm($st_competition,'Sports')
@@ -273,7 +300,9 @@ class  MatchList extends Controller {
                 $where = [
                     [$st_competition.'.status','<', '2'],
                     [$st_competition.'.source',$this->source['source']],
-                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)]
+                    [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)],
+                    [$st_competition.'.home_team','<>',null],
+                    [$st_competition.'.guest_team','<>',null],
                     ];
                 //所有赛事
                 $data = lm($st_competition,'Sports')
@@ -290,7 +319,9 @@ class  MatchList extends Controller {
                     [$st_competition.'.status','<', '2'],
                     [$st_competition.'.source',$this->source['source']],
                     [$st_competition.'.us_time','>',qgmdate('Y-m-d H:i:s', '', -4)],
-                    [$st_league.'.lg_id',$lg_id]
+                    [$st_league.'.lg_id',$lg_id],
+                    [$st_competition.'.home_team','<>',null],
+                    [$st_competition.'.guest_team','<>',null],
                 ];
                 //指定联赛下的赛事
                 $data = lm($st_competition,'Sports')
@@ -328,6 +359,8 @@ class  MatchList extends Controller {
                     ->where($where)
                     ->where($Orwhere)
                     ->where($where_search)
+                    ->where($st_competition.'.home_team','<>',null)
+                    ->where($st_competition.'.guest_team','<>',null)
                     ->distinct($st_competition.'.match_id')
                     ->count($st_competition.'.match_id');
 
@@ -338,11 +371,13 @@ class  MatchList extends Controller {
                     ->leftjoin('st_country','st_country.country_id',$st_league.'.country_id')
                     ->leftjoin('st_area','st_area.id',$st_league.'.area_id')
                     ->select($st_competition.'.match_id',$st_competition.'.home_team',$st_competition.'.guest_team',$st_competition.'.match_date',$st_competition.'.status',$st_competition.'.match_time',$st_competition.'.tag')
+                    ->distinct($st_competition.'.match_id')
                     ->where($where)
                     ->where($Orwhere)
                     ->where($where_search)
-                    ->distinct($st_competition.'.match_id')
                     ->where($st_competition.'.lg_id',$v['lg_id'])
+                    ->where($st_competition.'.home_team','<>',null)
+                    ->where($st_competition.'.guest_team','<>',null)
                     ->get()
                     ->toarray();
                 if(!$data[$k]['match_info']){
@@ -412,6 +447,7 @@ class  MatchList extends Controller {
             ->distinct('st_area.title')
             ->where($st_league.'.name_chinese','like','%'.$search.'%')
             ->where($st_league.'.source',$this->source)
+            ->where()
             ->where([])
             ->get()
             ->toArray();