seven 1 일 전
부모
커밋
39e3b1cc04
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      app/Jobs/FiveSecondTaskJob.php
  2. 6 6
      app/Services/IssueService.php

+ 1 - 1
app/Jobs/FiveSecondTaskJob.php

@@ -49,7 +49,7 @@ class FiveSecondTaskJob implements ShouldQueue
             // 你的业务逻辑
             IssueService::getLatestIssue(); // 获取最新的期号
 
-            IssueService::syncCloseIssue(); // 同步封盘的期号
+            IssueService::syncCloseIssue(); // 同步停止
             // Log::info('✅ 获取到最新期号: ' . ($latestIssue ?? '无'));
             
             // 重要:使用类名而不是 self(),避免递归

+ 6 - 6
app/Services/IssueService.php

@@ -584,7 +584,7 @@ class IssueService extends BaseService
 
         }
         $nextDrawInfo = $result['data']['nextDrawInfo'];
-        if($nextDrawInfo['nextDrawTime'] < date('H:i:s')) {
+        if($nextDrawInfo['nextDrawTime'] >= date('H:i:s')) {
             $endTime = date('Y-m-d').' '.$nextDrawInfo['nextDrawTime']; // 下一期的截止时间
         }else{
             $endTime = date('Y-m-d',strtotime('+1 day')).' '.$nextDrawInfo['nextDrawTime']; // 下一期的截止时间
@@ -621,13 +621,13 @@ class IssueService extends BaseService
     // 停止下注
     public static function syncCloseIssue()
     {
-
-        $list = self::model()::where('status', self::model()::STATUS_BETTING)
-                ->where('end_time', '<', date('Y-m-d H:i:s',time() + 20)) // 提前20秒
-                ->get();
+        $now_date = date('Y-m-d H:i:s',time() + 20); // 提前20秒
+        $list = self::findAll(['status' => self::model()::STATUS_BETTING]);
 
         foreach($list as $k => $v){
-            self::closeBetting($v->id);
+            if($v['end_time'] < $now_date){
+                self::closeBetting($v->id);
+            }
         }
     }
 }