Tree 1 mesiac pred
rodič
commit
539b87f264

+ 14 - 16
app/Console/Commands/ExemptReview.php

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 
 
 use App\Facade\TableName;
+use App\Http\helper\NumConfig;
 use App\Models\AccountsInfo;
 use App\Models\Cpf;
 use App\Models\SystemStatusInfo;
@@ -131,20 +132,17 @@ class ExemptReview extends Command
                 continue;
             }
             // 读取免审配置
-            $config = DB::table(TableName::agent().'withdrawal_position_config')->where('status', 1)->first();
-            if ($config) {
-
-                $agent = $config->agent;
-                if (empty($agent)) { // 默认第一家
-                    $agent = DB::connection('write')->table('agent.dbo.admin_configs')->where('config_value', 1)
-                               ->where('type', 'cash')->where('status', 1)->first()->config_value;
-                }
-
-                // 验证用户提现方式
-                $verifyAccountWithdrawal = $WithdrawalModel->AccountWithDrawInfo($value->UserID, $agent);
-                if (!$verifyAccountWithdrawal) {
-                    Log::info('不支持的提现格式'.$value->OrderId);
-                    continue;
+//            $config = DB::table(TableName::agent().'withdrawal_position_config')->where('status', 1)->first();
+            if (true) {
+
+                if($value->PixType == 2){
+                    $agent = 101;
+                }else{
+                    if(($value->WithDraw/NumConfig::NUM_VALUE)<20){
+                        $agent = 99;
+                    }else{
+                        $agent = 101;
+                    }
                 }
 
                 $redis = Redis::connection();
@@ -155,7 +153,7 @@ class ExemptReview extends Command
 
                 $redis->set($order_sn.'key1', $order_sn, 3600 * 24);
                 $log = ['user_id'   => $value->UserID,
-                        'config_id' => $config->id,
+//                        'config_id' => $config->id,
                         'use_quota' => intval($value->WithDraw),
                         'order_sn'  => $value->OrderId];
                 DB::connection('write')->table('agent.dbo.withdrawal_position_log')
@@ -184,7 +182,7 @@ class ExemptReview extends Command
                 $BranchBank = $value->BranchBank;
                 $BankNO = $value->BankNO;
                 // 改变状态处理中
-                $agentID = DB::connection('write')->table('agent.dbo.admin_configs')->where('config_value', $agent)
+                $agentID = DB::connection('write')->table('agent.dbo.admin_configs')->where('config_value', strval($agent))
                              ->select('id')->first()->id ?? '';
 
                 DB::connection('write')->table('QPAccountsDB.dbo.OrderWithDraw')->where('OrderId', $OrderId)

+ 3 - 0
app/Http/logic/admin/GlobalLogicController.php

@@ -557,6 +557,8 @@ class GlobalLogicController extends BaseLogicController
 
         // 用户余额
         $score = $userInfo->gameScoreInfo->Score;
+
+        $insureScore = $userInfo->gameScoreInfo->InsureScore;
         // 上级ID
         //$userInfo->spreaderID = $userInfo->SpreaderID;
         // 上级ID
@@ -667,6 +669,7 @@ class GlobalLogicController extends BaseLogicController
             'shareLastReward' => $shareLastReward,
             'waitGetEmailScore' => $waitGetEmailScore,
             'score' => $score,
+            'insureScore' => $insureScore,
 
 
         ];

+ 2 - 1
app/Services/GlobalUser.php

@@ -68,7 +68,7 @@ class GlobalUser extends BaseApiLogic
             ->select('StatusValue')
             ->first()->StatusValue ?? 0;
         $adminChannels=session('admin_channels');
-        $field = ['ai.GameID', 'ai.UserID', 'ai.SpreaderID', 'ai.NickName', 'ai.MemberOrder', 'ai.Nullity', 'ai.WebLogonTimes', 'ai.LastLogonIP', 'ai.LastLogonDate', 'ai.RegisterIP', 'ai.RegisterDate', 'ai.Channel', 'gi.Score', 'gi.MaxScore', 'gi.MaxWinScore'];
+        $field = ['ai.GameID', 'ai.UserID', 'ai.SpreaderID', 'ai.NickName', 'ai.MemberOrder', 'ai.Nullity', 'ai.WebLogonTimes', 'ai.LastLogonIP', 'ai.LastLogonDate', 'ai.RegisterIP', 'ai.RegisterDate', 'ai.Channel', 'gi.Score', 'gi.Score','gi.InsureScore', 'gi.MaxScore', 'gi.MaxWinScore'];
         $Sql = DB::connection('read')->table(TableName::QPAccountsDB() . 'AccountsInfo as ai')
             ->leftJoin(TableName::QPTreasureDB() . 'GameScoreInfo as gi', 'ai.UserID', 'gi.UserID')
             ->where('ai.IsAndroid', 0)
@@ -238,6 +238,7 @@ class GlobalUser extends BaseApiLogic
             $value->PhoneNum = isset($PhoneNums[$value->UserID]) ? $PhoneNums[$value->UserID] : '';
             $value->Nullity = $value->Nullity == 0 ? '正常' : '封禁';
             $value->Score = $value->Score / NumConfig::NUM_VALUE;
+            $value->InsureScore = $value->InsureScore / NumConfig::NUM_VALUE;
             $value->MaxScore = $value->MaxScore / NumConfig::NUM_VALUE;
             $value->MaxWinScore = $value->MaxWinScore / NumConfig::NUM_VALUE;
             // 可提现额度

+ 2 - 2
resources/views/admin/global/id_list.blade.php

@@ -132,8 +132,8 @@
                                 <td width="5%" colspan="2">{{ __('auto.金豆信息') }}</td>
                             </tr>
                             <tr>
-                                <td>{{ __('auto.当前金豆') }}</td>
-                                <td>{{ $data['score'] }}</td>
+                                <td>{{ __('auto.当前金豆') }}/{{ __('auto.当前星币') }}</td>
+                                <td>{{ $data['score'] }}/{{ $data['insureScore'] }}</td>
                             </tr>
 
                             <tr>

+ 2 - 0
resources/views/admin/global/userlist.blade.php

@@ -173,6 +173,7 @@
                                         </div>
 
                                     </th>
+                                    <th width="6%">{{ __('auto.免费币') }}</th>
                                     <th width="6%">{{ __('auto.总输赢') }}</th>
                                     <th width="6%">{{ __('auto.最高分') }}</th>
                                     <th width="6%">{{ __('auto.最多赢分') }}</th>
@@ -207,6 +208,7 @@
                                         <td>{{$item->NickName}}</td>
                                         <td>{{$item->PhoneNum}}</td>
                                         <td>{{ $item->Score }}</td>
+                                        <td>{{ $item->InsureScore }}</td>
                                         <td>{{ $item->totalScore ?? 0 }}</td>
                                         <td>{{ $item->MaxScore ?? 0 }}</td>
                                         <td>{{ $item->MaxWinScore ?? 0 }}</td>