rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/20251202' into feature/gongfu 

# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
This commit is contained in:
曹鹏飞 2025-12-02 17:38:18 +08:00
parent c424378f99 9d58b51998
commit c1b41b4de1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -708,11 +708,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
request.getIds().forEach(id -> { request.getIds().forEach(id -> {
AppUser appUser = getById(id); AppUser appUser = getById(id);
VUtils.trueThrowBusinessError(Objects.isNull(appUser)) VUtils.trueThrowBusinessError(Objects.isNull(appUser))
.throwMessage("用户不存在"); .throwMessage("用户不存在:" + id);
VUtils.trueThrowBusinessError(Objects.equals(appUser.getState(), UserState.ToBeActivated.getState())) VUtils.trueThrowBusinessError(Objects.equals(appUser.getState(), UserState.ToBeActivated.getState()))
.throwMessage(id + "未激活不能续期"); .throwMessage(appUser.getName() + "未激活不能续期");
VUtils.trueThrowBusinessError(Objects.equals(appUser.getIsPrimary(), false))
.throwMessage(id + "不是主账号");
appUser.setExpireTime(appUser.getExpireTime().plusMonths(request.getMonth())); appUser.setExpireTime(appUser.getExpireTime().plusMonths(request.getMonth()));
appUser.setUpdateBy(AdminUserUtil.getUserName()); appUser.setUpdateBy(AdminUserUtil.getUserName());
appUser.setUpdateTime(now); appUser.setUpdateTime(now);