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-10 00:45:40 +08:00
parent 8960a5f8a7
commit 689968ebc1
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
View File

@@ -119,6 +119,7 @@ public class UserInfo implements Serializable {
* 择偶条件-地区 * 择偶条件-地区
*/ */
private String filterResidence; private String filterResidence;
private String filterResidenceCode;
/** /**
* 择偶条件-年收入 * 择偶条件-年收入
*/ */

6
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
View File

@@ -38,7 +38,7 @@ public class UpdateUserFullInfoReq {
@Schema(description = "婚况") @Schema(description = "婚况")
private Integer marriage; private Integer marriage;
@Schema(description = "职业") @Schema(description = "职业")
private Integer profession; private String profession;
@Schema(description = "年收入") @Schema(description = "年收入")
private Integer annualIncome; private Integer annualIncome;
@Schema(description = "公司性质") @Schema(description = "公司性质")
@@ -86,8 +86,8 @@ public class UpdateUserFullInfoReq {
private String filterMarriage; private String filterMarriage;
@Schema(description = "择偶条件-学历") @Schema(description = "择偶条件-学历")
private Integer filterEducation; private Integer filterEducation;
@Schema(description = "择偶条件-地区") @Schema(description = "择偶条件-地区Code")
private String filterResidence; private String filterResidenceCode;
@Schema(description = "择偶条件-年收入") @Schema(description = "择偶条件-年收入")
private Integer filterAnnualIncome; private Integer filterAnnualIncome;
@Schema(description = "择偶条件-小孩情况") @Schema(description = "择偶条件-小孩情况")

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
View File

@@ -215,6 +215,8 @@ public class CurrentUserFullInfoVo {
*/ */
@Schema(description = "择偶条件-地区") @Schema(description = "择偶条件-地区")
private String filterResidence; private String filterResidence;
@Schema(description = "择偶条件-地区Code")
private String filterResidenceCode;
/** /**
* 择偶条件-年收入 * 择偶条件-年收入
*/ */

3
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
View File

@@ -206,6 +206,9 @@ public class HomeUserVo {
*/ */
@Schema(description = "择偶条件-地区") @Schema(description = "择偶条件-地区")
private String filterResidence; private String filterResidence;
@Schema(description = "择偶条件-地区Code")
private String filterResidenceCode;
/** /**
* 择偶条件-年收入 * 择偶条件-年收入
*/ */

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

@@ -266,6 +266,11 @@ public class CurrentUserManager {
userService.updateById(updateUser); userService.updateById(updateUser);
UserInfo updateUserInfo = BeanConvertUtil.convertTo(req, UserInfo::new); UserInfo updateUserInfo = BeanConvertUtil.convertTo(req, UserInfo::new);
if(StringUtils.isNotEmpty(req.getFilterResidenceCode())){
AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
updateUserInfo.setFilterResidenceCode(req.getFilterResidenceCode());
updateUserInfo.setFilterResidence(areaCode.getFullname());
}
UserInfo userInfo = userInfoService.getByUserId(userId); UserInfo userInfo = userInfoService.getByUserId(userId);
updateUserInfo.setId(userInfo.getId()); updateUserInfo.setId(userInfo.getId());
updateUserInfo.setUpdateTime(LocalDateTime.now()); updateUserInfo.setUpdateTime(LocalDateTime.now());