lip 1 týždeň pred
rodič
commit
6bb8f2cc2d

+ 37 - 29
app/Console/Commands/Sport.php

@@ -245,30 +245,29 @@ class Sport extends Command
                 SportModel::where('data_id', $item['fixture']['id'])->update($sport_data);
                 SportModel::where('data_id', $item['fixture']['id'])->update($sport_data);
             }
             }
 
 
-            if ($sport_data['state'] == 2 ) {
+            if ($sport_data['state'] == 2) {
                 $data_id = $item['fixture']['id'];
                 $data_id = $item['fixture']['id'];
                 //比赛结束,插入比赛事件
                 //比赛结束,插入比赛事件
                 if (!empty($item['events'])) {
                 if (!empty($item['events'])) {
                     $this->insertSportEvents($data_id, $item['events']);
                     $this->insertSportEvents($data_id, $item['events']);
                 }
                 }
-                //比赛结束,插入比赛事件
+                //比赛结束,插入比赛统计数据
                 $data = SportClientService::statistics(['fixture' => $data_id,'half' => 'true']);
                 $data = SportClientService::statistics(['fixture' => $data_id,'half' => 'true']);
-                // file_put_contents("fixturesStatistics.json", json_encode($data));
+                file_put_contents("fixturesStatistics.json", json_encode($data));
                 $statistics_data = empty($data['response']) ? [] : $data['response'];
                 $statistics_data = empty($data['response']) ? [] : $data['response'];
                 foreach($statistics_data as $item) {
                 foreach($statistics_data as $item) {
-                $team_id = $item['team']['id'];
-                //上半场的数据
-                if(!empty($item['statistics_1h'])) {
-                    $statistics_1h = $item['statistics_1h'];
-                    $this->insertSportStatistics($data_id, $team_id, $statistics_1h, 1); 
-                }
-                //下半场的数据
-                if(!empty($item['statistics_2h'])) {
-                    $statistics_2h = $item['statistics_2h'];
-                    $this->insertSportStatistics($data_id, $team_id, $statistics_2h, 2); 
+                    $team_id = $item['team']['id'];
+                    //上半场的数据
+                    if(!empty($item['statistics_1h'])) {
+                        $statistics_1h = $item['statistics_1h'];
+                        $this->insertSportStatistics($data_id, $team_id, $statistics_1h, 1); 
+                    }
+                    //下半场的数据
+                    if(!empty($item['statistics_2h'])) {
+                        $statistics_2h = $item['statistics_2h'];
+                        $this->insertSportStatistics($data_id, $team_id, $statistics_2h, 2); 
+                    }
                 }
                 }
-            }
-
                 
                 
             }
             }
         }
         }
@@ -345,21 +344,30 @@ class Sport extends Command
                 SportModel::addSportLeague($item['league']);
                 SportModel::addSportLeague($item['league']);
 
 
                 //比赛结束,插入比赛事件
                 //比赛结束,插入比赛事件
-                if (isset($sport_data['state']) && $sport_data['state'] == 2 && !empty($item['events'])) {
-                    foreach($item['events'] as $event) {
-                        SportEvent::create([
-                            'data_id' => $item['fixture']['id'],
-                            'type' => $event['type'],
-                            'time_elapsed' => $event['time']['elapsed'],
-                            'time' => json_encode($event['time']),
-                            'detail' => $event['detail'],
-                            'player' => $event['player'] ? json_encode($event['player']) : $event['player'],
-                            'team_id' => $event['team']['id'],
-                            'comments' => $event['comments'],
-                            'assist' => $event['assist'] ? json_encode($event['assist']) : $event['assist'],
-                        ]);
+                if (isset($sport_data['state']) && $sport_data['state'] == 2 ) {
+                    
+                    $data_id = $item['fixture']['id'];
+                    if (!empty($item['events'])) {
+                        $this->insertSportEvents($data_id, $item['events']);
+                    }
+                    
+                    //比赛结束,插入比赛事件
+                    $data = SportClientService::statistics(['fixture' => $data_id,'half' => 'true']);
+                    file_put_contents("fixturesStatistics.json", json_encode($data));
+                    $statistics_data = empty($data['response']) ? [] : $data['response'];
+                    foreach($statistics_data as $item) {
+                        $team_id = $item['team']['id'];
+                        //上半场的数据
+                        if(!empty($item['statistics_1h'])) {
+                            $statistics_1h = $item['statistics_1h'];
+                            $this->insertSportStatistics($data_id, $team_id, $statistics_1h, 1); 
+                        }
+                        //下半场的数据
+                        if(!empty($item['statistics_2h'])) {
+                            $statistics_2h = $item['statistics_2h'];
+                            $this->insertSportStatistics($data_id, $team_id, $statistics_2h, 2); 
+                        }
                     }
                     }
-    
                 }
                 }
             }
             }
             if ($tableData) {
             if ($tableData) {

+ 1 - 1
app/Services/BalanceLogService.php

@@ -26,7 +26,7 @@ class BalanceLogService extends BaseService
         '体彩投注','体彩退款','体彩和局退款','体彩中奖','体彩输半退款',
         '体彩投注','体彩退款','体彩和局退款','体彩中奖','体彩输半退款',
         '澳门六合彩投注','澳门六合彩退款','澳门六合彩和局退款','澳门六合彩中奖',
         '澳门六合彩投注','澳门六合彩退款','澳门六合彩和局退款','澳门六合彩中奖',
         '香港六合彩投注','香港六合彩退款','香港六合彩和局退款','香港六合彩中奖','PC28投注','极速28投注',
         '香港六合彩投注','香港六合彩退款','香港六合彩和局退款','香港六合彩中奖','PC28投注','极速28投注',
-        '投注','中奖', '资产转移', '比比返', '返水', '回水', '笔笔返', '投注退分','即充即送','余额宝转入','转出至余额宝','余额宝利息','老用户回归'
+        '投注','中奖', '资产转移', '比比返', '返水', '回水', '笔笔返', '投注退分','充值返现','即充即送','老用户回归','余额宝转入','转出至余额宝','余额宝利息','流水解冻'
     ];
     ];
 
 
     public static function init($telegram, $data, $chatId, $firstName, $messageId, $callbackId): void
     public static function init($telegram, $data, $chatId, $firstName, $messageId, $callbackId): void