From 4c3362382ee51797531251797ccee5e5dcb7681d Mon Sep 17 00:00:00 2001 From: chuan <2154243450@qq.com> Date: Sat, 8 Feb 2025 14:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=BB=E7=BB=93=E5=85=85=E5=80=BC=20?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E6=8F=90=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/UserService.php | 24 +++++++++++++++++------- app/admin/validate/UserValidate.php | 5 +++-- app/home/service/PayService.php | 2 +- app/home/service/WalletService.php | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 7f55763..8e5a247 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -217,7 +217,7 @@ class UserService extends AdminBaseService $accountFrozenList = []; if ($userIdArr) { $accountFrozenList = AccountFrozenModel::where('user_id', 'in', $userIdArr) - ->column('frozen_state', 'user_id'); + ->column('frozen_recharge,frozen_withdraw', 'user_id'); } @@ -228,12 +228,14 @@ class UserService extends AdminBaseService ->join([$subQuery => 'w'], 'a.user_id=w.user_id AND a.login_date=w.last_login_date')->column(['id', 'ip', 'country', 'city'], 'a.user_id'); foreach ($userList as $item) { - $frozenState = isset($accountFrozenList[$item['user_id']]) ? $accountFrozenList[$item['user_id']] : 0; + $frozenRecharge = isset($accountFrozenList[$item['user_id']]['frozen_recharge']) ? $accountFrozenList[$item['user_id']]['frozen_recharge'] : 0; + $frozenWithdraw = isset($accountFrozenList[$item['user_id']]['frozen_withdraw']) ? $accountFrozenList[$item['user_id']]['frozen_withdraw'] : 0; $key = 'LEVERAGE:' . $item['user_id']; $leverage_num=empty(Cache::store('redis')->get($key))? 1: Cache::store('redis')->get($key); $userRow= [ 'id' => $item['user_id'], - 'frozen_state' => $frozenState, + 'frozen_recharge' => $frozenRecharge, + 'frozen_withdraw' => $frozenWithdraw, 'user_no' => $item['user_no'], 'nickname' => $item['nick_name'], 'regTime' => $item['create_time'], @@ -500,8 +502,6 @@ class UserService extends AdminBaseService // 参数校验 validate(UserValidate::class)->scene('frozen_state')->check($param); $userId = $param['id']; - $frozenState = $param['frozen_state']; //1-冻结；0-解冻 - $frozenReason = $param['frozen_reason']?? ""; //冻结原因 $user = UserModel::where('user_id', $userId)->find(); if (empty($user)) { return $this->toData('1', '用户不存在'); @@ -513,9 +513,19 @@ class UserService extends AdminBaseService // 查询冻结记录表 $accountFrozen = AccountFrozenModel::where('user_id', $userId)->find(); if (empty($accountFrozen)) { - AccountFrozenModel::create(['user_id'=>$userId, 'frozen_state' => $frozenState, 'frozen_reason'=>$frozenReason]); + if (isset($param['frozen_recharge'])) { + AccountFrozenModel::create(['user_id'=>$userId, 'frozen_recharge' => $param['frozen_recharge']]); + } + if (isset($param['frozen_withdraw'])) { + AccountFrozenModel::create(['user_id'=>$userId, 'frozen_withdraw' => $param['frozen_withdraw']]); + } } else { - AccountFrozenModel::update(['frozen_state' => $frozenState, 'frozen_reason' => $frozenReason], ['user_id' => $userId]); + if (isset($param['frozen_recharge'])) { + AccountFrozenModel::update(['frozen_recharge' => $param['frozen_recharge']], ['user_id' => $userId]); + } + if (isset($param['frozen_withdraw'])) { + AccountFrozenModel::update(['frozen_withdraw' => $param['frozen_withdraw']], ['user_id' => $userId]); + } } return $this->toData('0', 'SUCCESS'); } catch (ValidateException $validateException) { diff --git a/app/admin/validate/UserValidate.php b/app/admin/validate/UserValidate.php index 12e3c0f..0477681 100644 --- a/app/admin/validate/UserValidate.php +++ b/app/admin/validate/UserValidate.php @@ -14,7 +14,8 @@ class UserValidate extends AdminBaseValidate 'user_no' => 'alphaNum', 'email' => 'email', 'status' => 'require|in:1,2,3', - 'frozen_state' => 'require|in:1,0', + 'frozen_recharge' => 'in:1,0', + 'frozen_withdraw' => 'in:1,0', 'nation'=>'require', 'password'=>'require', 'id' =>'require|integer', @@ -48,7 +49,7 @@ class UserValidate extends AdminBaseValidate protected $scene = [ 'index' => ['page','limit','user_no', 'email', 'phone', 'start_time', 'end_time'], 'status' => ['id','status'], - 'frozen_state' => ['id','frozen_state'], + 'frozen_state' => ['id','frozen_recharge','frozen_withdraw'], 'change' => ['id','amount'], 'relation' => ['page','limit','user_no'], 'add_phone' =>['nation','phone','password'], diff --git a/app/home/service/PayService.php b/app/home/service/PayService.php index c3101d4..dcee597 100644 --- a/app/home/service/PayService.php +++ b/app/home/service/PayService.php @@ -37,7 +37,7 @@ class PayService extends BaseHomeService { //判断账号是否冻结 $isFrozen = AccountFrozenModel::where('user_id', $data['user_id'])->find(); - if (!empty($isFrozen) && $isFrozen->frozen_state == 1) { + if (!empty($isFrozen) && $isFrozen->frozen_recharge == 1) { return $this->toData('100110', 'The current account has been frozen', []); } $channel = PaymentListModel::getPaymentInfo([ diff --git a/app/home/service/WalletService.php b/app/home/service/WalletService.php index cec0417..5cb1394 100644 --- a/app/home/service/WalletService.php +++ b/app/home/service/WalletService.php @@ -1001,7 +1001,7 @@ class WalletService extends BaseHomeService { //判断账号是否冻结 $isFrozen = AccountFrozenModel::where('user_id', $data['user_id'])->find(); - if (!empty($isFrozen) && $isFrozen->frozen_state == 1) { + if (!empty($isFrozen) && $isFrozen->frozen_withdraw == 1) { return $this->toData('100110', 'The current account has been frozen', []); } //校验交易密码