This commit is contained in:
张良(004796)
2024-01-18 13:59:46 +08:00
parent c69560c50f
commit fce0047b57
5 changed files with 54 additions and 16 deletions

View File

@@ -3,10 +3,10 @@ package com.ruoyi.cai.manager;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.cai.auth.CaiLoginManager;
import com.ruoyi.cai.domain.*;
import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes;
import com.ruoyi.cai.dto.app.query.AnchorUpdateReq;
import com.ruoyi.cai.dto.app.query.FinishUserUpdateReq;
import com.ruoyi.cai.dto.app.query.UserUpdateReq;
import com.ruoyi.cai.dto.app.vo.AnchorVo;
import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
@@ -14,6 +14,8 @@ import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserAccountVo;
import com.ruoyi.cai.dto.app.vo.user.UserAlbumDTO;
import com.ruoyi.cai.dto.app.vo.user.UserCountVo;
import com.ruoyi.cai.enums.GenderEnum;
import com.ruoyi.cai.executor.ExecutorConstant;
import com.ruoyi.cai.service.*;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
@@ -116,8 +118,12 @@ public class CurrentUserManager {
return true;
}
@Autowired
private CaiLoginManager loginManager;
public boolean userUpdate(UserUpdateReq res) {
res.setUserId(LoginHelper.getUserId());
User user = userService.getById(res.getUserId());
boolean updateFlag = false;
boolean updateYunxin = false;
UpdateUinfoReq uinfoReq = new UpdateUinfoReq();
@@ -130,9 +136,10 @@ public class CurrentUserManager {
updateFlag=true;
updateYunxin=true;
}
if(res.getInviteId() != null){
if(res.getInviteId() != null && user.getInviteId() != null){
update.set(User::getInviteId,res.getInviteId());
// TODO 邀请人的后续操作
user.setInviteId(res.getInviteId());
ExecutorConstant.COMMON_EXECUTOR.execute(() -> loginManager.dealInviteId(user));
}
if(res.getBirthday() != null){
update.set(User::getBirthday,res.getBirthday());
@@ -141,10 +148,15 @@ public class CurrentUserManager {
updateYunxin=true;
}
if(res.getGender() != null){
User user = userService.getById(res.getUserId());
GenderEnum genderEnum = GenderEnum.getByCode(res.getGender());
if(genderEnum == null){
throw new ServiceException("性别参数异常");
}
if(user.getGender() != 0 && !user.getGender().equals(res.getGender())){
throw new ServiceException("性别不可以修改");
}
update.set(User::getGender,genderEnum.getCode());
update.set(User::getAvatar,genderEnum.getDefaultAvatar());
}
if(res.getCityId() != null){
update.set(User::getCityId,res.getCityId());
@@ -152,11 +164,13 @@ public class CurrentUserManager {
updateFlag=true;
}
if(StringUtils.isNotEmpty(res.getAvatar())){
update.set(User::getAvatar,res.getAvatar());
update.set(User::getAvatarState,1);
if(!GenderEnum.checkDefaultAvatar(res.getAvatar())){
update.set(User::getAvatar,res.getAvatar());
update.set(User::getAvatarState,1);
// uinfoReq.setIcon(res.getAvatar());
// updateYunxin=true;
updateFlag=true;
updateFlag=true;
}
}
if(updateFlag){
boolean flag = userService.update(update);