2
0
Tree преди 2 дни
родител
ревизия
9274e130ab

+ 1 - 1
app/Game/Services/AgentService.php

@@ -137,7 +137,7 @@ class AgentService
                     }
 
                 }else{
-                    $reward = rand(20,100);
+                    $reward = rand(20,50);
                     $update = ['Amount' => $activity->Amount+$reward];
                 }
                 // BonusLog 入库

+ 17 - 1
app/Http/Controllers/Game/ExtensionsController.php

@@ -7,6 +7,7 @@ namespace App\Http\Controllers\Game;
 use App\dao\Pay\AccountPayInfo;
 use App\Facade\TableName;
 use App\Game\AgentLinks;
+use App\Game\AgentUser;
 use App\Game\GlobalUserInfo;
 use App\Game\Services\AgentService;
 use App\Http\helper\NumConfig;
@@ -250,7 +251,7 @@ class ExtensionsController
         }
 
         if($activity->TotalKan == 0){
-            $result = rand(3200,3600);
+            $result = rand(3000,3600);
             $type = 2;
         }else{
             $type=1;
@@ -363,6 +364,21 @@ class ExtensionsController
                     ->insert(['UserID' => $UserID, 'DrawBase' => $exchangeScore]);
             }
 
+            // 邀请人发起提现后,解除其下所有被邀请人的绑定关系
+            AgentUser::query()
+                ->where('Higher1ID', $UserID)
+                ->update([
+                    'Higher1GUID' => null,
+                    'Higher1ID'   => 0,
+                    'Higher2GUID' => null,
+                    'Higher2ID'   => 0,
+                    'Higher3GUID' => null,
+                    'Higher3ID'   => 0,
+                    'Higher4GUID' => null,
+                    'Higher4ID'   => 0,
+                    'LinkCode'    => '',
+                ]);
+
             $writeConn->commit();
         } catch (\Throwable $e) {
             $writeConn->rollBack();

+ 1 - 1
app/Http/Controllers/Game/PayRechargeController.php

@@ -458,7 +458,7 @@ class PayRechargeController extends Controller
                 ][$bettingTaskStatus] ?? __('web.gift.status_unknown')
             ];
         }
-        $giftInfo['expired'] = strtotime($giftRecord->created_at)+86400*7;
+        $giftInfo['expired'] = strtotime(date('Y-m-d',strtotime($giftRecord->created_at)))+86400*7;
         return apiReturnSuc([
             'has_purchased' => true,  // 已购买标记
             'gift_info' => $giftInfo

+ 1 - 1
app/Http/Controllers/Game/WebRouteController.php

@@ -278,7 +278,7 @@ class WebRouteController extends Controller
             'registerOpen'=>$config->RegOpen??env('CONFIG_REG_OPEN','sms,mail'),//id,phone,sms,mail,guest
             'loginOpen'=>$config->LoginOpen??'id,phone,sms,mail,guest',
             'slotsPartner' => $slotsPartner,
-            'outLimit' => ['cashapp' => 2000,'paypal' => 800],
+            'outLimit' => ['cashapp' => 2000,'paypal' => 2000],
             'withdrawChannel' => ['cashapp','paypal'],
             'freeChannel' => ['paypal'],
             'sharePop' => $sharePop,

+ 42 - 1
app/Services/PayMentService.php

@@ -149,7 +149,18 @@ class PayMentService
         $matrix = [];
         foreach ($services as $v) {
             for ($i = 0; $i < $v->sort; $i++) {
-                if(Redis::exists("PayErro_".$v->config_key)) continue;
+//                if(Redis::exists("PayErro_".$v->config_key)) continue;
+                if(!empty($v->remarks)&&$v->remarks!=null){
+                    $remarks=json_decode($v->remarks,true);
+                    // 按支付类型校验金额是否在允许范围内:不满足则跳过该渠道
+                    if(isset($remarks['limit'])){
+                        $typeKey='type_'.$pay_method;
+                        $limitConfig=$remarks['limit'][$typeKey]??null;
+                        if($limitConfig!==null && !self::isAmountInLimit($payAmt,$limitConfig)){
+                            continue;
+                        }
+                    }
+                }
                 $matrix[] = $v->config_key;
             }
         }
@@ -163,6 +174,36 @@ class PayMentService
         $res = $matrix[mt_rand(0, count($matrix)-1)];
         return $res;
     }
+
+    /**
+     * 判断支付金额是否在 limit 配置的取值范围内
+     * @param float $payAmt 支付金额
+     * @param mixed $limitConfig 配置:数组为允许金额列表;['min'=>x,'max'=>y] 为区间;'all' 或 ['全部'] 为不限制
+     * @return bool
+     */
+    public static function isAmountInLimit($payAmt, $limitConfig)
+    {
+        if ($limitConfig === 'all' || $limitConfig === '全部' || $limitConfig === ['全部']) {
+            return true;
+        }
+        if (isset($limitConfig['min']) && isset($limitConfig['max'])) {
+            $min = (float)$limitConfig['min'];
+            $max = (float)$limitConfig['max'];
+            $amt = (float)$payAmt;
+            return $amt >= $min && $amt <= $max;
+        }
+        if (is_array($limitConfig)) {
+            $payAmtRounded = round((float)$payAmt, 2);
+            foreach ($limitConfig as $allowed) {
+                if (round((float)$allowed, 2) === $payAmtRounded) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
     /**
      * 根据支付方式随机获取充值渠道
      * @param $method

+ 1 - 1
resources/lang/en/messages.php

@@ -256,7 +256,7 @@ return [
             "user_already_signed_in" => "You have already signed in today",
             "signin_event_ended" => "The sign-in activity has ended",
             "signin_data_error" => "Failed to read sign-in data",
-            "recharge_required" => "Recharge is required to sign in",
+            "recharge_required" => "Deposit any amount to get it",
             "unknown_error" => "Unknown error",
             "exception_occurred" => "An error occurred while processing your request"
         ],

+ 19 - 6
resources/views/admin/Withdrawal/verify_finish.blade.php

@@ -1,13 +1,23 @@
 @extends('base.base')
 @section('base')
     <style>
-        .row {
-            margin-left: -51px;
-            margin-right: -60px;
-        }
         .table th{
             width: 20px;
         }
+
+        @media screen and (max-width: 991px) {
+            .row {
+                margin-left: 0 !important;
+                margin-right: 0 !important;
+            }
+        }
+        @media screen and (min-width: 992px) {
+            .row {
+                margin-left: -51px;
+                margin-right: -60px;
+            }
+        }
+
     </style>
     <!-- 内容区域 -->
     <div class="main-panel">
@@ -202,9 +212,11 @@
 
                                 </div>
 
-
                             </form>
-                            <table class="table table-bordered" style="table-layout: fixed">
+
+                            <div class="table-responsive">
+
+                            <table class="table table-bordered">
                                 <thead>
                                 <tr>
                                     <th>{{ __('auto.单号') }}</th>
@@ -340,6 +352,7 @@
                                 @endforeach
                                 </tbody>
                             </table>
+                            </div>
                             <div class="box-footer clearfix" id="pages">
                                 {{ __('auto.总共') }} <b>{{ $list->appends([
                                         'list'=>$list,

+ 55 - 1
resources/views/admin/Withdrawal/waitWithdrawal.blade.php

@@ -1,6 +1,56 @@
 @extends('base.base')
 @section('base')
     <style>
+        /* 搜索表单移动端适配 */
+        @media screen and (max-width: 991px) {
+            .well.form-inline {
+                display: flex !important;
+                flex-direction: column !important;
+            }
+            .well.form-inline > div {
+                display: flex !important;
+                flex-wrap: wrap !important;
+                gap: 8px 10px;
+                align-items: center;
+            }
+            .well.form-inline > div > spen {
+                display: block;
+                width: 100%;
+                padding-left: 0 !important;
+                font-weight: 600;
+                font-size: 0.85rem;
+                margin-top: 4px;
+            }
+            .well.form-inline > div > .form-control,
+            .well.form-inline > div > select.form-control {
+                width: 100% !important;
+                max-width: 100% !important;
+                box-sizing: border-box;
+            }
+            .well.form-inline > div > input[type="datetime-local"] {
+                width: 100% !important;
+                max-width: 100% !important;
+            }
+            .well.form-inline > div > .btn,
+            .well.form-inline > div > input[type="submit"] {
+                flex: 1;
+                min-width: 80px;
+                max-width: 120px;
+            }
+            .well.form-inline > div > br {
+                display: none;
+            }
+        }
+
+        @media screen and (max-width: 576px) {
+            .well.form-inline > div > spen {
+                font-size: 0.8rem;
+            }
+            .well.form-inline > div > .form-control {
+                font-size: 0.8rem;
+                padding: 0.35rem 0.5rem;
+            }
+        }
 
     </style>
     <!-- 内容区域 -->
@@ -168,7 +218,10 @@
 
 
                             </form>
-                            <table class="table table-bordered" style="table-layout: fixed">
+
+                            <div class="table-responsive">
+
+                            <table class="table table-bordered">
                                 <thead>
                                 <tr>
                                     <th>{{ __('auto.单号') }}</th>
@@ -327,6 +380,7 @@
                                 @endforeach
                                 </tbody>
                             </table>
+                            </div>
                             <div class="box-footer clearfix" id="pages">
                                 {{ __('auto.总共') }} <b>{{ $list->appends([
                                          'list'=>$list,

+ 56 - 0
resources/views/base/base.blade.php

@@ -77,6 +77,62 @@
 
         /* 移动端响应式优化 */
         @media screen and (max-width: 991px) {
+            /* 表单 form-inline 适配 - 移动端自动堆叠 */
+            .form-inline,
+            .well.form-inline {
+                flex-direction: column !important;
+                align-items: stretch !important;
+            }
+
+            .form-inline > div,
+            .well.form-inline > div {
+                display: flex !important;
+                flex-wrap: wrap !important;
+                gap: 8px 10px;
+                align-items: center;
+            }
+
+            .form-inline spen,
+            .well.form-inline spen {
+                display: block;
+                width: 100%;
+                padding-left: 0 !important;
+                font-weight: 600;
+                font-size: 0.85rem;
+                margin-top: 4px;
+            }
+
+            .form-inline .form-control,
+            .well.form-inline .form-control,
+            .form-inline select.form-control,
+            .well.form-inline select.form-control {
+                width: 100% !important;
+                max-width: 100% !important;
+                flex: 1 1 100%;
+                box-sizing: border-box;
+            }
+
+            .form-inline input[type="datetime-local"],
+            .well.form-inline input[type="datetime-local"] {
+                width: 100% !important;
+                max-width: 100% !important;
+                flex: 1 1 100%;
+            }
+
+            .form-inline br,
+            .well.form-inline br {
+                display: none;
+            }
+
+            /* 按钮行保持横排 */
+            .form-inline .btn,
+            .form-inline input[type="submit"],
+            .well.form-inline .btn,
+            .well.form-inline input[type="submit"] {
+                flex: 0 0 auto;
+                min-width: 70px;
+            }
+
             /* 内容区域优化 */
             html, body {
                 background-color: #f2edf3 !important;

+ 2 - 0
routes/web.php

@@ -778,6 +778,8 @@ Route::group([
         $route->any('/pg-game-config', 'Admin\PGGameConfigController@index')->name('admin.pg-game-config');
         $route->any('/common-config', 'Admin\CommonConfigController@index')->name('admin.common-config');
         $route->any('/common-config/update', 'Admin\CommonConfigController@update')->name('admin.common-config.update');
+        $route->any('/special-config', 'Admin\SpecialConfigController@index')->name('admin.special-config');
+        $route->any('/special-config/update', 'Admin\SpecialConfigController@update')->name('admin.special-config.update');
         $route->any('/pg-game-config/update', 'Admin\PGGameConfigController@update')->name('admin.pg-game-config.update');
         $route->post('/pg-game-config/copy_all', 'Admin\PGGameConfigController@copyAll')->name('admin.pg-game-config.copy_all');