Merge branch 'master' of http://47.76.126.2:3000/seven/bot-28

app/Http/Controllers/admin/Wallet.php

@@ -252,9 +252,9 @@ class Wallet extends Controller
     public function test()
     {
 
-        $url = "https://ydpc28.co/api/pc28/list";
-        $result = file_get_contents($url);
-        $result = json_decode($result, true);
+        // $url = "https://ydpc28.co/api/pc28/list";
+        // $result = file_get_contents($url);
+        // $result = json_decode($result, true);
 
         $input = request()->get('input','');
         // var_dump($input);
@@ -303,6 +303,9 @@ class Wallet extends Controller
         // $result = PaymentOrderService::createPay($memberId,200,'test');
         // PaymentOrderService::sendMessage($result['chat_id'],$result['text'],[],$result['image']??'');
         // $result = KeyboardService::checkStart($memberId,'Select Language');
+
+        $awards = IssueService::award([7,2,1]);
+        $result = BetService::betSettled('3367329', $awards);
         echo "<pre>";
         var_dump($result);
     }

app/Services/IssueService.php

@@ -304,8 +304,8 @@ class IssueService extends BaseService
         $winArr = array_map('intval', explode(',', $winning_numbers));
         // 计算中奖
         $awards = self::award(explode(',', $winning_numbers));
-        DB::beginTransaction();
-        try {
+        // DB::beginTransaction();
+        // try {
             $info->status = self::model()::STATUS_DRAW;
             $info->winning_numbers = $winning_numbers;
             $info->combo = $combo;
@@ -354,13 +354,13 @@ class IssueService extends BaseService
             BetService::betSettled($info->issue_no, $awards);
 
 
-            DB::commit();
+            // DB::commit();
             return ['code' => self::YES, 'msg' => '开奖成功'];
-        } catch (\Exception $e) {
-            DB::rollBack();
-            Log::error('开奖失败: ' . $e->getMessage() . $winning_numbers);
-            return ['code' => self::NOT, 'msg' => '开奖失败'];
-        }
+        // } catch (\Exception $e) {
+        //     DB::rollBack();
+        //     Log::error('开奖失败: ' . $e->getMessage() . $winning_numbers);
+        //     return ['code' => self::NOT, 'msg' => '开奖失败'];
+        // }
     }
 
 
@@ -834,13 +834,13 @@ class IssueService extends BaseService
 
                 $key = 'lottery_numbers_' . $v->issue_no;
                 $combo = implode(' ', $combo);
-                if (Cache::add($key, $winning_numbers, 100)) {
+                // if (Cache::add($key, $winning_numbers, 100)) {
                     self::lotteryDraw($v->id, $winning_numbers, $combo, '');
                     $new = false;
-                }
+                // }
 
-                Log::error('开奖缓存: ' .$key);
-                Log::error('开奖缓存结果: ' .($new ? '新开奖' : '已开奖') );
+                // Log::error('开奖缓存: ' .$key);
+                // Log::error('开奖缓存结果: ' .($new ? '新开奖' : '已开奖') );
 
             }
         }