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