diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php index 54f8a13..49ea65b 100644 --- a/app/common/repositories/user/UserRepository.php +++ b/app/common/repositories/user/UserRepository.php @@ -1149,9 +1149,14 @@ class UserRepository extends BaseRepository public function returnToken($user, $tokenInfo) { - if (!$user->status) { - throw new ValidateException('账号已被禁用'); + 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(); } + $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 [ 'token' => $tokenInfo['token'], diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php index 8c768ff..97e5e87 100644 --- a/app/controller/api/user/User.php +++ b/app/controller/api/user/User.php @@ -58,12 +58,15 @@ class User extends BaseController $type = $this->request->param('type'); $user = $this->user; $siteName = systemConfig('site_name'); - $qrcode = $type == 'routine' - ? $this->repository->mpQrcode($user) - : $this->repository->wxQrcode($user); + $qrcode = $type == 'routine' ? $this->repository->mpQrcode($user) : $this->repository->wxQrcode($user); $poster = systemGroupData('spread_banner'); $nickname = $user['nickname']; $mark = '邀请您加入' . $siteName; + // 处理图片路径 必须为https + $jsonPoster = json_encode($poster,JSON_UNESCAPED_SLASHES); + $jsonPoster = str_replace('http://','https://',$jsonPoster); + $poster = json_decode($jsonPoster,true); + return app('json')->success(compact('qrcode', 'poster', 'nickname', 'mark')); }