diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java index 44803b8..73505e3 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java @@ -103,8 +103,6 @@ public class AuthAppController { return R.ok(); } - - @PostMapping("/resetPassword") @Operation(summary = "重置密码") @Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = false) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java index 55adc43..ec61c0d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java @@ -171,27 +171,8 @@ public class CurrentUserManager { updateUserInfo.setUpdateTime(LocalDateTime.now()); updateUserInfo.setId(userInfo.getId()); userInfoService.updateById(updateUserInfo); - // 检查finishStatus - boolean finishBaseStatus = true; - User user = userService.getById(userId); - if(user.getForPersonals() == null || user.getGender() == 0 - || user.getBirthday() == null || user.getHeight() == null - || user.getWeight() == null || user.getResidenceCode() == null - || user.getAddressCode() == null || user.getEducation() == null - || user.getMarriage() == null || user.getProfession() == null - || user.getAnnualIncome() == null || user.getUsercode() == null){ - finishBaseStatus = false; - } - userInfo = userInfoService.getById(userInfo.getId()); - if(userInfo.getCarStatus() == null || userInfo.getHousingStatus() == null){ - finishBaseStatus = false; - } - if(finishBaseStatus){ - userService.update(Wrappers.lambdaUpdate(User.class) - .eq(User::getId,user.getId()) - .set(User::getFinishBaseStatus, 1)); - } + userService.checkFinishStatus(userId); } @Autowired diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java index f3b1921..391c11e 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java @@ -58,4 +58,6 @@ public interface UserService extends IService { void saveUser(AddUserReq bo); void updateBaseUser(UpdateUserReq updateUserReq); + + void checkFinishStatus(Long userId); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java index 1b869b5..75ba924 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java @@ -394,5 +394,30 @@ public class UserServiceImpl extends ServiceImpl implements Use updateUser.setProfession(updateUserReq.getProfession()); updateUser.setAnnualIncome(updateUserReq.getAnnualIncome()); this.updateById(updateUser); + this.checkFinishStatus(user.getId()); + } + + @Override + public void checkFinishStatus(Long userId){ + boolean finishBaseStatus = true; + User user = this.getById(userId); + if(user.getForPersonals() == null || user.getGender() == 0 + || user.getBirthday() == null || user.getHeight() == null + || user.getWeight() == null || user.getResidenceCode() == null + || user.getAddressCode() == null || user.getEducation() == null + || user.getMarriage() == null || user.getProfession() == null + || user.getAnnualIncome() == null || user.getUsercode() == null){ + finishBaseStatus = false; + } + UserInfo userInfo = userInfoService.getByUserId(userId); + if(userInfo.getCarStatus() == null || userInfo.getHousingStatus() == null){ + finishBaseStatus = false; + } + if(finishBaseStatus){ + this.update(Wrappers.lambdaUpdate(User.class) + .eq(User::getId,user.getId()) + .set(User::getBaseStep, 14) + .set(User::getFinishBaseStatus, 1)); + } } }