Ken 1 giorno fa
parent
commit
83bf5f3b9e

+ 1 - 1
app/Services/BetService.php

@@ -1007,7 +1007,7 @@ class BetService extends BaseService
         $inlineButton = self::getOperateButton();
         // 群通知
         $pc28Switch = Config::where('field', 'pc28_switch')->first()->val;
-        if(($pc28Switch== 0 && is_numeric($issue_no)) || $pc28Switch== 1 && !is_numeric($issue_no)){
+        if (($pc28Switch == 0 && is_numeric($issue_no)) || $pc28Switch == 1 && !is_numeric($issue_no)) {
             SendTelegramGroupMessageJob::dispatch($text, $inlineButton, '', false, '--------------------------------');
         }
 

+ 4 - 4
app/Services/IssueService.php

@@ -207,7 +207,7 @@ class IssueService extends BaseService
         if ($info->status != self::model()::STATUS_BETTING) {
             return ['code' => self::NOT, 'msg' => '期号状态不正确'];
         }
-
+        $pc28Switch = Config::where('field', 'pc28_switch')->first()->val;
         $info->status = self::model()::STATUS_CLOSE;
         $info->save();
         $replyInfo = KeyboardService::findOne(['button' => '停止下注']);
@@ -218,12 +218,12 @@ class IssueService extends BaseService
             if ($image) {
                 $image = url($image);
             }
-            // self::bettingGroupNotice($text, $buttons, $image);
-            self::asyncBettingGroupNotice($text, $buttons, $image);
+            if ($pc28Switch == 0) self::asyncBettingGroupNotice($text, $buttons, $image);
         }
 
         // 投注情况通知
-        BetService::statNotice($info->issue_no);
+        if ($pc28Switch == 0) BetService::statNotice($info->issue_no);
+
 
         $replyInfo = KeyboardService::findOne(['button' => '封盘开奖']);
         if ($replyInfo) {

+ 18 - 2
app/Services/PcIssueService.php

@@ -31,12 +31,28 @@ class PcIssueService extends BaseService
 
     private static function fengPan()
     {
-        $list = PcIssue::where('status', PcIssue::STATUS_BETTING)->get();
+        $list = PcIssue::where('status', PcIssue::STATUS_BETTING)
+            ->orderByDesc('id')
+            ->get();
         $now = time();
-        foreach ($list as $item) {
+        $pc28Switch = Config::where('field', 'pc28_switch')->first()->val;
+        $replyInfo = KeyboardService::findOne(['button' => '停止下注']);
+        if ($replyInfo) {
+            $text = $replyInfo->reply;
+            $buttons = json_decode($replyInfo->buttons, true);
+            $image = $replyInfo->image;
+            if ($image) {
+                $image = url($image);
+            }
+        }
+
+        foreach ($list as $index => $item) {
             if (strtotime($item->end_time) - 30 <= $now) {
                 $item->status = PcIssue::STATUS_CLOSE;
                 $item->save();
+                if ($replyInfo && $pc28Switch == 1 && $index == 0) self::asyncBettingGroupNotice($text, $buttons, $image);
+                // 投注情况通知
+                if ($pc28Switch == 1 && $index == 0) BetService::statNotice($item->issue_no);
             }
         }
     }