From 44d9f53015aed2ca44797f05d0025a3dca3815ac Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Wed, 29 May 2024 10:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=A2=9E=E5=8A=A0=E4=BA=BA=E4=BA=BA=E5=88=86=E9=94=80?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=EF=BC=8C=20=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=90=8E=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=BC=80=E5=90=AF=E6=8E=A8=E5=B9=BF=E5=91=98=E3=80=82?= =?UTF-8?q?=E5=B7=B2=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E8=87=AA=E5=8A=A8=E6=88=90=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E9=94=80=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/user/UserRepository.php | 13 +++++++------ app/controller/admin/system/config/ConfigOthers.php | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php index 9069a8b..59954b3 100644 --- a/app/common/repositories/user/UserRepository.php +++ b/app/common/repositories/user/UserRepository.php @@ -1174,12 +1174,13 @@ class UserRepository extends BaseRepository public function returnToken($user, $tokenInfo) { if (!$user->status) throw new ValidateException('账号已被禁用'); - // // 判断：如果用户未开启推广员 则开启推广员 - // if($user->is_promoter != 1){ - // $user->is_promoter = 1; - // $user->promoter_time = date('Y-m-d H:i:s'); - // $user->save(); - // } + // 判断：如果用户未开启推广员 则开启推广员 + $isOpenPromoter = (int)systemConfig('is_open_promoter'); + if($user->is_promoter != 1 && $isOpenPromoter == 1){ + $user->is_promoter = 1; + $user->promoter_time = date('Y-m-d H:i:s'); + $user->save(); + } $user = $user->hidden(['label_id', 'group_id', 'main_uid', 'pwd', 'addres', 'card_id', 'last_time', 'last_ip', 'create_time', 'mark', 'status', 'spread_uid', 'spread_time', 'real_name', 'birthday', 'brokerage_price'])->toArray(); return [ diff --git a/app/controller/admin/system/config/ConfigOthers.php b/app/controller/admin/system/config/ConfigOthers.php index 7d3f9cc..9e045d8 100644 --- a/app/controller/admin/system/config/ConfigOthers.php +++ b/app/controller/admin/system/config/ConfigOthers.php @@ -45,7 +45,8 @@ class ConfigOthers extends BaseController 'promoter_explain', 'user_extract_min', 'withdraw_type', - 'withdraw_commission' + 'withdraw_commission', + 'is_open_promoter' ]); if ($data['extension_two_rate'] < 0 || $data['extension_one_rate'] < 0)