wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：用户登录后如果不是推广员则开启推广员身份 

修复：由于图片路径错误导致分销推广海报生成失败
This commit is contained in:
wuhui_zzw 2023-11-21 15:27:32 +08:00
parent d03036b43e
commit a4ed855156
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/common/repositories/user/UserRepository.php
View File

@ -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'],

9
app/controller/api/user/User.php
View File

@ -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'));
}