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:
77
2024-04-23 01:36:07 +08:00
parent 67b73e82bb
commit f151ff02f3
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java
View File

@@ -103,8 +103,6 @@ public class AuthAppController {
return R.ok();
}
@PostMapping("/resetPassword")
@Operation(summary = "重置密码")
@Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = false)

21
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -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

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java
View File

@@ -58,4 +58,6 @@ public interface UserService extends IService<User> {
void saveUser(AddUserReq bo);
void updateBaseUser(UpdateUserReq updateUserReq);
void checkFinishStatus(Long userId);
}

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

@@ -394,5 +394,30 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> 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));
}
}
}