diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/task/AppUserScheduledTasks.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/task/AppUserScheduledTasks.java index 48baa9b7..86d1de35 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/task/AppUserScheduledTasks.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/task/AppUserScheduledTasks.java @@ -18,38 +18,38 @@ import java.util.stream.Collectors; @Slf4j public class AppUserScheduledTasks { - @Resource - private IAppUserService appUserService; - - /** - * 禁用已过期代理商 - * 每天午夜12点执行一次 - */ - @Transactional - @Scheduled(cron = "0 0 0 * * ?") - public void disableExpiredAppUser() { - List primaryAppUsers=appUserService.lambdaQuery() - .eq(AppUser::getIsPrimary, true) - .lt(AppUser::getExpireTime, LocalDateTime.now().toLocalDate()) - .list(); - if (CollectionUtil.isNotEmpty(primaryAppUsers)){ - appUserService.lambdaUpdate() - .set(AppUser::getState, UserState.Disabled.getState()) - .set(AppUser::getUpdateTime, LocalDateTime.now()) - .ne(AppUser::getState, UserState.Disabled.getState()) - .in(AppUser::getId, primaryAppUsers.stream().map(AppUser::getId).collect(Collectors.toList())) - .update(); - for (AppUser primaryUser : primaryAppUsers) { - List children=appUserService.getChildren(primaryUser); - if (CollectionUtil.isNotEmpty(children)){ - appUserService.lambdaUpdate() - .set(AppUser::getState, UserState.Disabled.getState()) - .set(AppUser::getUpdateTime, LocalDateTime.now()) - .ne(AppUser::getState, UserState.Disabled.getState()) - .in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList())) - .update(); - } - } - } - } +// @Resource +// private IAppUserService appUserService; +// +// /** +// * 禁用已过期代理商 +// * 每天午夜12点执行一次 +// */ +// @Transactional +// @Scheduled(cron = "0 0 0 * * ?") +// public void disableExpiredAppUser() { +// List primaryAppUsers=appUserService.lambdaQuery() +// .eq(AppUser::getIsPrimary, true) +// .lt(AppUser::getExpireTime, LocalDateTime.now().toLocalDate()) +// .list(); +// if (CollectionUtil.isNotEmpty(primaryAppUsers)){ +// appUserService.lambdaUpdate() +// .set(AppUser::getState, UserState.Disabled.getState()) +// .set(AppUser::getUpdateTime, LocalDateTime.now()) +// .ne(AppUser::getState, UserState.Disabled.getState()) +// .in(AppUser::getId, primaryAppUsers.stream().map(AppUser::getId).collect(Collectors.toList())) +// .update(); +// for (AppUser primaryUser : primaryAppUsers) { +// List children=appUserService.getChildren(primaryUser); +// if (CollectionUtil.isNotEmpty(children)){ +// appUserService.lambdaUpdate() +// .set(AppUser::getState, UserState.Disabled.getState()) +// .set(AppUser::getUpdateTime, LocalDateTime.now()) +// .ne(AppUser::getState, UserState.Disabled.getState()) +// .in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList())) +// .update(); +// } +// } +// } +// } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index fc64c1f6..59bd13a3 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -574,7 +574,7 @@ public class AppUserServiceImpl extends ServiceImpl impl if (request.getEnable()) { lambdaUpdate() .set(AppUser::getState, UserState.Activated.getState()) - .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) + .set(AppUser::getUpdateBy, AdminUserUtil.getUserName()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .eq(AppUser::getIsDel, false) .in(AppUser::getId, request.getIds()) @@ -582,7 +582,7 @@ public class AppUserServiceImpl extends ServiceImpl impl } else { lambdaUpdate() .set(AppUser::getState, UserState.Disabled.getState()) - .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) + .set(AppUser::getUpdateBy, AdminUserUtil.getUserName()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .eq(AppUser::getIsDel, false) .in(AppUser::getId, request.getIds()) @@ -596,7 +596,7 @@ public class AppUserServiceImpl extends ServiceImpl impl if (CollectionUtil.isNotEmpty(companyIds)) { lambdaUpdate() .set(AppUser::getState, UserState.Disabled.getState()) - .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) + .set(AppUser::getUpdateBy, AdminUserUtil.getUserName()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .eq(AppUser::getIsDel, false) .eq(AppUser::getIsPrimary, false)