修改

app/Console/Commands/Sport.php

@@ -289,16 +289,13 @@ class Sport extends Command
                     'data_id' => $item['fixture']['id'],
                     'home_team_id' => $item['teams']['home']['id'],
                     'home_team_en' => $item['teams']['home']['name'],
-                    'home_team' => lang($item['teams']['home']['name']),
                     'home_team_logo' => $item['teams']['home']['logo'],
                     'guest_team_id' => $item['teams']['away']['id'],
                     'guest_team_en' => $item['teams']['away']['name'],
-                    'guest_team' => lang($item['teams']['away']['name']),
                     'guest_team_logo' => $item['teams']['away']['logo'],
                     'half_score' => "{$item['score']['halftime']['home']}-{$item['score']['halftime']['away']}",
                     'rbt' => $item['fixture']['timestamp'],
                     'score' => isset($item['score']['fulltime']) ? "{$item['score']['fulltime']['home']}-{$item['score']['fulltime']['away']}":'-',
-                    'league' => lang($item['league']['name']),
                     'league_en' => $item['league']['name'],
                     // 'state' => $status[$item['fixture']['status']['short']],//比赛状态：0未开始1进行中2已完场3延期4取消
                     'game_time' => $item['fixture']['timestamp'],
@@ -316,8 +313,16 @@ class Sport extends Command
     
                 if (!SportModel::where('data_id', $item['fixture']['id'])->exists()) {
                     $sport_data['created_at'] = now();
+                    
+                    $sport_datap['home_team'] = SportTeam::getTeamName($sport_data['home_team_id']);
+                    $sport_data['guest_team'] = SportTeam::getTeamName($sport_data['guest_team_id']);
+                    $sport_data['league'] = SportLeague::getLeagueName($sport_data['league_en']);
                     $tableData[] = $sport_data;
                 } else {
+                    
+                    $sport_datap['home_team'] = SportTeam::getTeamName($sport_data['home_team_id']);
+                    $sport_data['guest_team'] = SportTeam::getTeamName($sport_data['guest_team_id']);
+                    $sport_data['league'] = SportLeague::getLeagueName($sport_data['league_en']);
                     SportModel::where('data_id', $item['fixture']['id'])->update($sport_data);
                 }
 

app/Http/Controllers/admin/Sport.php

@@ -25,8 +25,7 @@ class Sport extends Controller
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'data_id' => ['nullable', 'string'],
-                'home_team' => ['nullable', 'string'],
-                'guest_team' => ['nullable', 'integer'],
+                'team_name' => ['nullable', 'integer'],
                 'league' => ['nullable', 'string'],
                 'state' => ['nullable', 'integer'],
                 'status' => ['nullable', 'integer'],
@@ -35,6 +34,7 @@ class Sport extends Controller
                 'end_time' => ['nullable', 'string'],
                 'error' => ['nullable', 'integer'],
                 'odds' => ['nullable', 'integer'],
+                'is_rec' => ['nullable', 'integer'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
@@ -44,14 +44,21 @@ class Sport extends Controller
             if (!empty($params['data_id'])) {
                 $query = $query->where('data_id', $params['data_id']);
             }
-            if (!empty($params['home_team'])) {
-                $query = $query->where('home_team', $params['home_team']);
-            }
-            if (!empty($params['guest_team'])) {
-                $query = $query->where('guest_team', $params['guest_team']);
+            if (!empty($params['team_name'])) {
+                $team_name = $params['team_name'];
+                $query = $query->where(function ($query) use ($team_name) {
+                    $query->where('team_name', 'like', "%{$team_name}%")
+                    ->orWhere('team_name_en', 'like', "%{$team_name}%")
+                    ->orWhere('guest_team', 'like', "%{$team_name}%")
+                    ->orWhere('guest_team_en', 'like', "%{$team_name}%");
+                });
             }
             if (isset($params['league']) && $params['league'] !== null) {
-                $query = $query->where('league', $params['league']);
+                $league = $params['league'];
+                $query = $query->where(function ($query) use ($league) {
+                    $query->where('league', 'like', "%{$league}%")
+                    ->orWhere('league_en', 'like', "%{$league}%");
+                });
             }
             if (isset($params['state']) && $params['state'] !== null) {
                 $query = $query->where('state', $params['state']);
@@ -82,6 +89,9 @@ class Sport extends Controller
                     $query = $query->whereNull('odds');
                 }
             }
+            if (isset($params['is_rec']) && $params['is_rec'] !== null) {
+                $query = $query->where('is_rec', $params['is_rec']);
+            }
 
             $count = $query->count();
             $list = $query
@@ -143,6 +153,7 @@ class Sport extends Controller
                 'status' => ['nullable', 'integer'],
                 'state' => ['nullable', 'integer'],
                 'is_locked' => ['nullable', 'integer'],
+                'is_rec' => ['nullable', 'integer'],
             ]);
             $id = $params['id'];
             if (isset($params['state']) && $params['state'] !== null) {
@@ -158,6 +169,9 @@ class Sport extends Controller
             if (isset($params['status']) && $params['status'] !== null) {
                 SportModel::whereIn('id', $id)->update(['status' => $params['status'], 'is_send' => 0]);
             }
+            if (isset($params['is_rec']) && $params['is_rec'] !== null) {
+                SportModel::whereIn('id', $id)->update(['is_rec' => $params['is_rec']]);
+            }
             return $this->success();
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());

app/Models/Sport.php

@@ -12,7 +12,7 @@ class Sport extends BaseModel
     protected $fillable = ['data_id', 'home_team_id', 'home_team_en', 'home_team', 'home_team_logo', 'guest_team_id', 'guest_team_en', 'guest_team', 'guest_team_logo', 'half_score', 'rbt', 
     'is_roll', 'score', 'league_en','league','odds','state','game_time','status','handicap_limit','over_under_limit','duying_limit','correct_core_limit','odd_even_limit','total_goal_limit',
     'is_handicap', 'is_over_under','is_duying','is_correct_core','is_odd_even','is_total_goal','is_locked','fixture_status','is_send','odd_ids_locked','refund_status','odd_fixture_status',
-    'error','odd_values_locked','remark'];
+    'error','odd_values_locked','remark','is_rec'];
     protected $hidden = [];
     
     public static function getLongStatus($status){