|
|
@@ -4,6 +4,8 @@ namespace App\Console\Commands;
|
|
|
|
|
|
use Illuminate\Console\Command;
|
|
|
use App\Models\Sport as SportModel;
|
|
|
+use App\Models\SportTeam;
|
|
|
+use App\Models\SportLeague;
|
|
|
use App\Services\SportClientService;
|
|
|
use Carbon\Carbon;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
@@ -173,17 +175,14 @@ 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['goals']) ? "{$item['goals']['home']}-{$item['goals']['away']}":'-',
|
|
|
'extra_score' => isset($item['score']['extratime']) ? "{$item['score']['extratime']['home']}-{$item['score']['extratime']['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'],
|
|
|
@@ -236,6 +235,9 @@ class Sport extends Command
|
|
|
if (!$info) {
|
|
|
$sport_data['created_at'] = date('Y-m-d H:i:s');
|
|
|
$sport_data['status'] = 1;
|
|
|
+ $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 {
|
|
|
SportModel::where('data_id', $item['fixture']['id'])->update($sport_data);
|