shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
张良(004796)
2024-04-18 15:33:43 +08:00
parent 6ca720bd9f
commit 5f4ad8c3b0
20 changed files with 198 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -111,6 +111,8 @@ public class CurrentUserManager {
vo.setFinishBaseStatus(user.getFinishBaseStatus());
vo.setBaseStep(user.getBaseStep());
vo.setImToken(user.getImToken());
UserAuth userAuth = userAuthService.getByUserId(userId);
vo.setAlreadyAuthNum(userAuth.getAlreadyAuthNum());
List<UserPictures> userPictures = userPicturesService.listByUserIdAuditingAndSuccess(user.getId());
vo.setUserPicturesList(BeanConvertUtil.convertListTo(userPictures, UserPicturesDTO::new));
UserVip userVip = userVipService.getByUserVipMaster(userId);
@@ -143,10 +145,11 @@ public class CurrentUserManager {
updateUser.setAddressCode(req.getAddressCode());
updateUser.setAddressName(areaCode.getName());
}
if(StringUtils.isNotEmpty(req.getResidenceCode())){
if(req.getResidenceCode() != null){
AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
updateUser.setResidenceCode(req.getResidenceCode());
updateUser.setResidenceName(areaCode.getName());
updateUser.setResidenceCityCode(areaCode.getPcode());
updateUser.setResidenceCityName(areaCode.getPname());
}
if(req.getHeight() != null){
@@ -263,7 +266,7 @@ public class CurrentUserManager {
updateUser.setAddressCode(req.getAddressCode());
updateUser.setAddressName(areaCode.getFullname());
}
if(StringUtils.isNotEmpty(req.getResidenceCode())){
if(req.getResidenceCode() != null){
AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
updateUser.setResidenceCode(req.getResidenceCode());
updateUser.setResidenceName(areaCode.getFullname());
@@ -273,7 +276,7 @@ public class CurrentUserManager {
userService.updateById(updateUser);
UserInfo updateUserInfo = BeanConvertUtil.convertTo(req, UserInfo::new);
if(StringUtils.isNotEmpty(req.getFilterResidenceCode())){
if(req.getFilterResidenceCode() != null){
AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
updateUserInfo.setFilterResidenceCode(req.getFilterResidenceCode());
updateUserInfo.setFilterResidence(areaCode.getFullname());

1
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/LoginManager.java
View File

@@ -220,6 +220,7 @@ public class LoginManager {
userAuth.setUserId(user.getId());
userAuth.setPhone(user.getMobile());
userAuth.setPhoneAuth(AuditEnum.SUCCESS.getCode());
userAuth.setAlreadyAuthNum(1);
userAuthService.save(userAuth);
UserExtend userExtend = new UserExtend();
userExtend.setUsercode(usercode);