lip 3 недель назад
Родитель
Сommit
e53cc5a5f4

+ 6 - 15
app/Console/Commands/SportOdds.php

@@ -128,7 +128,7 @@ class SportOdds extends Command
                 $odd_fixture_status = null;//直播赔率中的赛事时间和状态(与直播赛事信息中的赛事时间和状态存在较大差异)
                 if (isset($item['fixture']['status']['long']) ) {
                     $long = $item['fixture']['status']['long'];
-                    if (isset($this->fixture_status[$long])) {
+                    // if (isset($this->fixture_status[$long])) {
                         
                         $sport_info = SportModel::where('data_id',$data_id)->first();
                         $fixture_status = $sport_info['fixture_status'] ? json_decode($sport_info['fixture_status'],true) : [];
@@ -139,27 +139,18 @@ class SportOdds extends Command
                         //如果时间差距超过3分钟,则锁盘
                         if (isset($fixture_status['elapsed']) && isset($odd_fixture_status['elapsed'])) {
                             if ( $fixture_status['elapsed'] - $odd_fixture_status['elapsed'] >= 3) {
-                                $odds = $sport_info['odds'] ? json_decode($sport_info['odds'],true) : null;
-                                $odds_ids = [];
-                                foreach($odds as $odd) {
-                                    $odds_ids[] = $odd['id'];
-                                }
-                                $update_data['error'] = 1;
-                                $update_data['is_locked'] = 1;
+                                
+                                $update_data['error'] = 1;      //异常
+                                $update_data['is_locked'] = 1; //锁盘
                                 unset($update_data['odds']);//不更新赔率
                             } else {
                                 $update_data['error'] = 0;
                             }
                         }
-                    } 
+                        
+                    // } 
                     
-                    // if (isset($this->long_status[$long])) {
-                    //     $update_data['state'] = $this->long_status[$long];
-                    // }
                 }
-                // if (isset($item['teams']['home']['goals'])) {
-                //     $update_data['score'] = $item['teams']['home']['goals'] ."-". $item['teams']['away']['goals'];
-                // }
                 
                 //锁盘
                 if (isset($item['fixture']['status']['blocked']) && $item['fixture']['status']['blocked']) {

+ 1 - 1
app/Http/Controllers/admin/Sport.php

@@ -114,7 +114,7 @@ class Sport extends Controller
             $info['rbt'] = date('Y-m-d H:i:s', $info['rbt']);
             $info['fixture_status'] = json_decode($info['fixture_status'], true);
             $info['odds'] = $info['odds'] ? json_decode($info['odds'], true) : null;
-            $info['odds'] = SportModel::doOdds($info['odds']);
+            $info['odds'] = $info['odds'] ? SportModel::doOdds($info['odds']) : null;
             $info['event'] = SportEvent::where('data_id', $info['data_id'])->get();
             $info['odd_ids_locked'] = $info['odd_ids_locked'] ? json_decode($info['odd_ids_locked'], true) : [];
 

+ 1 - 1
app/Models/LhcLottery.php

@@ -4,6 +4,6 @@ namespace App\Models;
 class LhcLottery extends BaseModel
 {
     protected $table = 'lhc_lottery';
-    protected $fillable = ['issue', 'open_code','open_time'];
+    protected $fillable = ['issue', 'open_code','open_time','is_settlement'];
 
 }

+ 1 - 1
app/Models/Sport.php

@@ -100,7 +100,7 @@ class Sport extends BaseModel
                 }
             }
             $item['name_en'] = $item['name'];
-            $item['name'] = $sport_odds[$item['name']]['odd_name'];
+            $item['name'] = isset($sport_odds[$item['name']]) ? $sport_odds[$item['name']]['odd_name'] : $item['name'];
             $new_odds[] = $item;
         }
         return $new_odds;