1、救济金加CD时间

2、后台部分更新

3、手机登录家日志

app/Http/Controllers/Admin/RechargeController.php

@@ -861,14 +861,14 @@ class RechargeController extends Controller
                 ->where('id', $id)
                 ->update([
                     'pay_status' => 9,
-                    'refund_fee' => ($order->payment_code=='AiNewPay' && $order->title==2)?800:3000,
+                    'refund_fee' => ($order->payment_code=='AiNewPay' && $order->order_title==2)?800:3000,
                     'updated_at' => $now,
                 ]);
 
             if ($updated === false) {
                 return apiReturnFail('设置退款状态失败');
             }
-            $fee = ($order->payment_code=='AiNewPay' && $order->title==2)?800:3000;
+            $fee = ($order->payment_code=='AiNewPay' && $order->order_title==2)?800:3000;
             (new RechargeWithDraw())->refund($order->user_id, $order->amount, $fee);
 
             $admin_id = $admin->id;

app/Http/Controllers/Game/ActivityController.php

@@ -142,6 +142,30 @@ class ActivityController extends Controller
         }
         $UserID=$user->UserID;
         $res=DB::connection('sqlsrv')->select("exec QPAccountsDB.dbo.GSP_GP_QueryProtect $UserID");
+        $cooldownSeconds = 2 * 60 * 60;
+        $lastRecvTime = DB::connection('sqlsrv')
+            ->table('QPAccountsDB.dbo.RecordProtectList')
+            ->where('UserID', $UserID)
+            ->value('UpdateDate');
+
+        $cooldownLeftSeconds = 0;
+        $cooldownEndTime = null;
+        if (!empty($lastRecvTime)) {
+            $end = Carbon::parse($lastRecvTime)->addSeconds($cooldownSeconds);
+            $now = now();
+            if ($now->lt($end)) {
+                $cooldownLeftSeconds = $now->diffInSeconds($end);
+                $cooldownEndTime = $end->toDateTimeString();
+            }
+        }
+
+        // 查询接口返回倒计时信息
+        if (!empty($res) && isset($res[0])) {
+            $res[0]->cooldown_seconds = $cooldownSeconds;
+            $res[0]->cooldown_left_seconds = $cooldownLeftSeconds;
+            $res[0]->cooldown_end_time = $cooldownEndTime;
+            $res[0]->can_receive = $cooldownLeftSeconds <= 0 ? 1 : 0;
+        }
 
         return apiReturnSuc($res);
     }
@@ -155,6 +179,27 @@ class ActivityController extends Controller
             //欧洲暂时封闭
             return apiReturnSuc();
         }
+        // 领取低保增加 2 小时 CD
+        $cooldownSeconds = 2 * 60 * 60;
+        $lastRecvTime = DB::connection('sqlsrv')
+            ->table('QPAccountsDB.dbo.RecordProtectList')
+            ->where('UserID', $UserID)
+            ->value('UpdateDate');
+        if (!empty($lastRecvTime)) {
+            $end = Carbon::parse($lastRecvTime)->addSeconds($cooldownSeconds);
+            $now = now();
+            if ($now->lt($end)) {
+                $left = $now->diffInSeconds($end);
+                return apiReturnFail(
+                    ['web.protect.cooldown', 'Please claim again after cooldown'],
+                    [
+                        'cooldown_seconds' => $cooldownSeconds,
+                        'cooldown_left_seconds' => $left,
+                        'cooldown_end_time' => $end->toDateTimeString(),
+                    ]
+                );
+            }
+        }
         $dbh = DB::connection()->getPdo();
 
         $sql="

app/Http/Controllers/Game/LoginController.php

@@ -82,7 +82,6 @@ class LoginController extends Controller
 
         $verifyCode = GamePhoneVerityCode::verifyCode($Phone, $PhoneCode);
         SetNXLock::release($redisKey);
-        //TODO 上线前去掉测试
         if ($verifyCode != trim($PhoneCode)) {
             Log::info('web.verify.code_incorrect_or_expired LoginByCode $verifyCode',[$Phone,$PhoneCode]);
             return apiReturnFail(['web.verify.code_incorrect_or_expired', 'O código está incorreto ou o tempo passou']);
@@ -93,6 +92,7 @@ class LoginController extends Controller
         $user = GlobalUserInfo::query()->where('RegionID', $config->isRegionUnique())->where("Phone", $Phone)->first();
         if ($user) {
             $user = GlobalUserInfo::toWebData($user);
+            Util::WriteLog('phone_login',$Phone);
             return response()->json(apiReturnSuc($user, ['login.success', 'Login bem-sucedido, bem-vindo de volta!']));//->withCookie($this->setLoginCookie($user['sign']));
         } else {
             return apiReturnFail(['web.login.notfound', 'Sua conta não foi encontrada, registre-se ou tente novamente!']);

resources/views/admin/login.blade.php

@@ -30,7 +30,7 @@
                   <input type="password" class="form-control form-control-lg" id="password" placeholder="{{trans('cs.login.notice_pass')}}">
                 </div>
                 <div class="form-group">
-                  <input type="text" class="form-control form-control-lg" id="ga_code" name="ga_code" autocomplete="off" maxlength="6" placeholder="谷歌验证码">
+                  <input type="text" class="form-control form-control-lg" id="ga_code" name="ga_code" autocomplete="off" maxlength="6" placeholder="手机验证码">
                 </div>
                 <div class="form-group">
                   <div class="input-group">