deploy: auto commit repo-root changes 2026-07-11 12:03:08

server/app/common/service/match/MatchLiveService.php

@@ -97,16 +97,11 @@ class MatchLiveService
         return '';
     }
 
-    public static function getLiveCards(
-        int $sportType = 0,
-        string $leagueName = '',
-        bool $worldCupOnly = false
-    ): array
+    public static function getLiveCards(int $sportType = 0, string $leagueName = ''): array
     {
         $query = MatchLive::alias('live')
-            ->join('match m', 'm.id = live.match_id')
-            ->where(['m.is_show' => 1])
-            ->where([['m.status', '<>', 2]]);
+            ->leftJoin('match m', 'm.id = live.match_id')
+            ->where('live.fetch_status', 1);
 
         if ($sportType > 0) {
             $query->where('m.sport_type', $sportType);
@@ -114,13 +109,6 @@ class MatchLiveService
         if ($leagueName !== '') {
             $query->where('m.league_name', $leagueName);
         }
-        if ($worldCupOnly) {
-            $query
-                ->where(function ($query) {
-                    $query->where('m.league_name', '世界杯')
-                        ->whereOr('m.competition_id', 61);
-                });
-        }
 
         $rows = $query
             ->field([
@@ -210,6 +198,6 @@ class MatchLiveService
 
     public static function getWorldCupLiveCards(): array
     {
-        return self::getLiveCards(0, '', true);
+        return self::getLiveCards();
     }
 }