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-25 11:32:20 +08:00
parent ad7017ab5c
commit d4f3d79b7c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
View File

@@ -122,13 +122,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
result.setUserPictureList(userPicturesList.stream().map(UserPictures::getPicture).collect(Collectors.toList())); result.setUserPictureList(userPicturesList.stream().map(UserPictures::getPicture).collect(Collectors.toList()));
result.setOpenVip(user.getOpenVip()); result.setOpenVip(user.getOpenVip());
result.setVipType(user.getVipType()); result.setVipType(user.getVipType());
UserAuth userAuth = userAuthService.getByUserId(userId);
UserAuthMinVo authMinVo = BeanConvertUtil.convertTo(userAuth, UserAuthMinVo::new);
result.setUserAuthInfo(authMinVo);
Long currentUserId = LoginHelper.getUserId(); Long currentUserId = LoginHelper.getUserId();
if(userId.equals(currentUserId)){ if(userId.equals(currentUserId)){
return result; return result;
} }
User currentUser = this.getById(currentUserId);
UserAuthMinVo authMinVo = BeanConvertUtil.convertTo(currentUser, UserAuthMinVo::new);
result.setUserAuthInfo(authMinVo);
// TODO 登录时间 // TODO 登录时间
boolean star = userStarService.existsStar(currentUserId, userId); boolean star = userStarService.existsStar(currentUserId, userId);
result.setStar(star); result.setStar(star);
@@ -270,7 +270,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
record.setBirthdayStr(BirthdayUtil.getMinBirthday(record.getBirthday())); record.setBirthdayStr(BirthdayUtil.getMinBirthday(record.getBirthday()));
record.setAge(BirthdayUtil.getAge(record.getBirthday())); record.setAge(BirthdayUtil.getAge(record.getBirthday()));
} }
return null; return result;
} }
@Override @Override

1
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java
View File

@@ -54,6 +54,7 @@ public class UserStatusServiceImpl extends ServiceImpl<UserStatusMapper,UserStat
update.setId(userStatus.getId()); update.setId(userStatus.getId());
update.setAllowTransMobile(req.getAllowTransMobile()); update.setAllowTransMobile(req.getAllowTransMobile());
update.setAllowTransWx(req.getAllowTransWx()); update.setAllowTransWx(req.getAllowTransWx());
update.setShowAvatar(req.getShowAvatar());
if(req.getPushVip() != null && req.getPushVip() == 1){ if(req.getPushVip() != null && req.getPushVip() == 1){
User user = userService.getById(req.getUserId()); User user = userService.getById(req.getUserId());
if(!user.getOpenVip()){ if(!user.getOpenVip()){