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)