This commit is contained in:
张良(004796)
2024-03-19 15:20:14 +08:00
parent 6fa752d8a8
commit 979d89eeac
25 changed files with 549 additions and 26 deletions

View File

@@ -0,0 +1,10 @@
package com.ruoyi.xq.dto.app.areacode;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class AreaCodeQuery {
@Schema(description = "父级节点传0返回一级节点")
private Integer pcode;
}

View File

@@ -1,9 +1,60 @@
package com.ruoyi.xq.dto.app.user;
import com.ruoyi.common.core.domain.PageQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@Data
public class HomePageReq extends PageQuery {
@Schema(hidden = true)
private LocalDate birthdayBegin;
@Schema(hidden = true)
private LocalDate birthdayEnd;
@Schema(description = "年龄-开始")
private Integer ageBegin;
@Schema(description = "年龄-结束")
private Integer ageEnd;
@Schema(description = "身高-开始")
private Integer heightBegin;
@Schema(description = "身高-结束")
private Integer heightEnd;
@Schema(description = "体重-开始")
private Integer weightBegin;
@Schema(description = "体重-结束")
private Integer weightEnd;
@Schema(description = "性别")
private Integer gender;
@Schema(description = "婚况")
private Integer marriage;
@Schema(description = "教育")
private Integer education;
@Schema(description = "居住地")
private String residenceCode;
@Schema(description = "VIP查询限制")
private VipQuery vipQuery;
@Data
public static class VipQuery {
@Schema(description = "职业")
private String profession;
@Schema(description = "年收入")
private Integer annualIncome;
@Schema(description = "生效")
private Integer zodiac;
@Schema(description = "星座")
private Integer sign;
@Schema(description = "小孩情况")
private Integer childStatus;
@Schema(description = "购房情况")
private Integer housingStatus;
@Schema(description = "购车情况")
private Integer carStatus;
@Schema(description = "户籍地")
private String addressCode;
}
}

View File

@@ -7,6 +7,8 @@ import java.time.LocalDate;
@Data
public class UpdateBaseInfoReq {
@Schema(description = "基础信息保存进度")
private Integer baseStep;
@Schema(description = "为谁征婚")
private Integer forPersonals;
@Schema(description = "性别 0-未知 1-女 2-男")
@@ -27,12 +29,12 @@ public class UpdateBaseInfoReq {
* 居住地
*/
@Schema(description = "居住地")
private String residence;
private String residenceCode;
/**
* 户籍地
*/
@Schema(description = "户籍地")
private String address;
private String addressCode;
/**
* 学历
*/

View File

@@ -28,9 +28,9 @@ public class UpdateUserFullInfoReq {
private Integer somatotype;
@Schema(description = "居住地")
private String residence;
private String residenceCode;
@Schema(description = "户籍地")
private String address;
private String addressCode;
@Schema(description = "学历")
private Integer education;
@Schema(description = "婚况")

View File

@@ -40,10 +40,16 @@ public class CurrentUserInfoVo {
private LocalDate birthday;
@Schema(description = "年龄")
private Integer age;
// @Schema(description = "城市ID")
// private Integer cityId;
@Schema(description = "居住城市")
private String residenceCity;
private String residenceCityName;
@Schema(description = "居住地名称")
private String residenceName;
@Schema(description = "居住地编码")
private String residenceCode;
@Schema(description = "户籍地名称")
private String addressName;
@Schema(description = "户籍地编码")
private String addressCode;
/**
* 状态 0 可用 1 不可用
*/
@@ -51,6 +57,8 @@ public class CurrentUserInfoVo {
private Integer status;
@Schema(description = "基础资料是否完成 0 未完成 1已完成")
private Integer finishBaseStatus;
@Schema(description = "基础信息完成进度")
private Integer baseStep;
@Schema(description = "imToken")
private String imToken;
@@ -63,7 +71,6 @@ public class CurrentUserInfoVo {
@Schema(description = "最大认证数量")
private Integer maxAuthNum = 8;
/**
* 相册
*/

View File

@@ -23,8 +23,10 @@ public class HomeUserListVo {
private LocalDate birthday;
@Schema(description = "生日-缩减显示")
private String birthdayStr;
@Schema(description = "居住城市")
private String residenceCity;
@Schema(description = "年龄")
private Integer age;
@Schema(description = "居住城市名称")
private String residenceCityName;
@Schema(description = "学历")
private Integer education;
@Schema(description = "职业")

View File

@@ -57,13 +57,17 @@ public class HomeUserVo {
/**
* 居住地
*/
@Schema(description = "居住地")
private String residence;
@Schema(description = "居住地名称")
private String residenceName;
@Schema(description = "居住地编码")
private String residenceCode;
/**
* 户籍地
*/
@Schema(description = "户籍地")
private String address;
@Schema(description = "户籍地名称")
private String addressName;
@Schema(description = "户籍地编码")
private String addressCode;
/**
* 学历
*/

View File

@@ -0,0 +1,9 @@
package com.ruoyi.xq.dto.common.user;
import lombok.Data;
@Data
public class MinUser {
private Long id;
private String usercode;
}