Przeglądaj źródła

提交极速游戏

lip 1 tydzień temu
rodzic
commit
63d67d9ae2

+ 15 - 7
app/Http/Controllers/admin/JisuGameOrder.php

@@ -38,7 +38,11 @@ class JisuGameOrder extends Controller
             $query = new JisuGameOrderModel();
             
             $query = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
-                        ->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id');
+                        ->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
+                        ->leftJoin('jisu_lottery', function($join) {
+                            $join->on('jisu_game_order.type', '=', 'jisu_lottery.type')
+                                 ->on('jisu_game_order.issue', '=', 'jisu_lottery.issue');
+                        });
             if (!empty($params['id'])) {
                 $query = $query->where('jisu_game_order.id', $params['id']);
             }
@@ -59,14 +63,14 @@ class JisuGameOrder extends Controller
             }
             if (!empty($params['start_time'])) {
                 $startTime = $params['start_time'] . " 00:00:00";
-                $query = $query->where('sport_game_order.created_at', '>=', $startTime);
+                $query = $query->where('jisu_game_order.created_at', '>=', $startTime);
             }
             if (!empty($params['end_time'])) {
                 $endTime = $params['end_time'] . " 23:59:59";
-                $query = $query->where('sport_game_order.created_at', '<=', $endTime);
+                $query = $query->where('jisu_game_order.created_at', '<=', $endTime);
             }
             $count = $query->count();
-            $list = $query->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay','jisu_gameplay.number')
+            $list = $query->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay','jisu_gameplay.number','jisu_lottery.open_code','jisu_lottery.open_code_other')
                 ->forPage($page, $limit)
                 ->orderByDesc('jisu_game_order.created_at')
                 ->get();
@@ -87,8 +91,12 @@ class JisuGameOrder extends Controller
             $id = request()->input('id');
             $order = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
                         ->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
+                        ->leftJoin('jisu_lottery', function($join) {
+                            $join->on('jisu_game_order.type', '=', 'jisu_lottery.type')
+                                 ->on('jisu_game_order.issue', '=', 'jisu_lottery.issue');
+                        })
                         ->where('jisu_game_order.id', $id)
-                        ->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay')
+                        ->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay','jisu_lottery.open_code','jisu_lottery.open_code_other')
                         ->first();
             if (!$order) throw new Exception('订单不存在');
             $order = $order->toArray();
@@ -122,13 +130,13 @@ class JisuGameOrder extends Controller
 
                 // 获取用户余额
                 $walletInfo = Wallet::where(['member_id' => $order->member_id])->first();
-                if (!$walletInfo) continue;
-                
+
                 $before = $walletInfo->available_balance;
                 $after = bcsub($walletInfo->available_balance, $order->amount, 2);
                 $walletInfo->available_balance = $after;
                 $walletInfo->save();
                 $remark = JisuGameplay::getRemark($order->type);
+                
                 FundsRecord::addData([
                     'change_type' => $remark.'退款',
                     'amount' => $order->amount,

+ 5 - 1
app/Http/Controllers/admin/JisuLottery.php

@@ -87,7 +87,11 @@ class JisuLottery extends Controller
                 if (count($params['advance_code']) != 5) {
                     throw new Exception('开奖号码必须是5个数');
                 }
-            } else {
+            } if ($info->type == 6) {
+                if (count($params['advance_code']) != 3) {
+                    throw new Exception('开奖号码必须是3个数');
+                }
+            }else {
                 if (count($params['advance_code']) != 10) {
                     throw new Exception('开奖号码必须是10个数');
                 }

+ 5 - 0
app/Models/JisuGameplay.php

@@ -41,6 +41,11 @@ class JisuGameplay extends BaseModel
             return 'SG时时彩';
         } elseif ($type == 5) {
             return 'SG飞艇';
+        } elseif ($type == 6) {
+            return '极速快3';
+        } elseif ($type == 7) {
+            return 'SG快3';
         }
+        return $type;
     }
 }

+ 2 - 0
app/Services/BalanceLogService.php

@@ -32,8 +32,10 @@ class BalanceLogService extends BaseService
         '极速赛车投注','极速赛车退款','极速赛车和局退款','极速赛车中奖',
         '极速时时彩投注','极速时时彩退款','极速时时彩和局退款','极速时时彩中奖',
         '极速飞艇投注','极速飞艇退款','极速飞艇和局退款','极速飞艇中奖',
+        '极速快3投注','极速快3退款','极速快3和局退款','极速快3中奖',
         'SG时时彩投注','SG时时彩退款','SG时时彩和局退款','SG时时彩中奖',
         'SG飞艇投注','SG飞艇退款','SG飞艇和局退款','SG飞艇中奖',
+        'SG快3投注','SG快3退款','SG快3和局退款','SG快3中奖',
         '投注','中奖', '资产转移', '比比返', '返水', '回水', '笔笔返', '投注退分','充值返现','即充即送','老用户回归','余额宝转入','转出至余额宝','余额宝利息','流水解冻'
     ];