记得上下班打卡 | git大法好,push需谨慎

Commit 02e3a516 authored by 张国柄's avatar 张国柄

fix:valid param;

parent e4ccf045
...@@ -18,15 +18,19 @@ public class AdamAddressesParam implements java.io.Serializable { ...@@ -18,15 +18,19 @@ public class AdamAddressesParam implements java.io.Serializable {
private String name; private String name;
@ApiModelProperty(position = 12, required = true, value = "手机号[11]", example = "13111111111") @ApiModelProperty(position = 12, required = true, value = "手机号[11]", example = "13111111111")
@Pattern(regexp = "\\d{11}", message = "手机号格式有误") @Pattern(regexp = "\\d{11}", message = "手机号格式有误")
@NotBlank(message = "手机号不能为空")
private String phone; private String phone;
@ApiModelProperty(position = 13, required = true, value = "省份[30]", example = "北京") @ApiModelProperty(position = 13, required = true, value = "省份[30]", example = "北京")
@Pattern(regexp = LnsRegex.Valid.CN_PCD, message = "省份必须为2~30位汉字") @Pattern(regexp = LnsRegex.Valid.CN_PCD, message = "省份必须为2~30位汉字")
@NotBlank(message = "省份不能为空")
private String province; private String province;
@ApiModelProperty(position = 14, required = true, value = "城市[30]", example = "北京城区") @ApiModelProperty(position = 14, required = true, value = "城市[30]", example = "北京城区")
@Pattern(regexp = LnsRegex.Valid.CN_PCD, message = "城市必须为2~30位汉字") @Pattern(regexp = LnsRegex.Valid.CN_PCD, message = "城市必须为2~30位汉字")
@NotBlank(message = "城市不能为空")
private String city; private String city;
@ApiModelProperty(position = 15, required = true, value = "区县[30]", example = "朝阳区") @ApiModelProperty(position = 15, required = true, value = "区县[30]", example = "朝阳区")
@Pattern(regexp = LnsRegex.Valid.CN_PCD, message = "区县必须为2~30位汉字") @Pattern(regexp = LnsRegex.Valid.CN_PCD, message = "区县必须为2~30位汉字")
@NotBlank(message = "区县不能为空")
private String county; private String county;
@ApiModelProperty(position = 16, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区") @ApiModelProperty(position = 16, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区")
@Size(max = 100, message = "已超出详细地址长度限制") @Size(max = 100, message = "已超出详细地址长度限制")
......
...@@ -18,6 +18,7 @@ public class AdamEntersParam implements java.io.Serializable { ...@@ -18,6 +18,7 @@ public class AdamEntersParam implements java.io.Serializable {
private String name; private String name;
@ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000") @ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000")
@Pattern(regexp = "\\d{11}", message = "手机号格式有误") @Pattern(regexp = "\\d{11}", message = "手机号格式有误")
@NotBlank(message = "手机号不能为空")
private String mobile; private String mobile;
@ApiModelProperty(position = 13, required = true, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5") @ApiModelProperty(position = 13, required = true, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5")
@NotNull(message = "证件类型不能位空") @Min(value = 1, message = "证件类型无效") @Max(value = 5, message = "证件类型无效") @NotNull(message = "证件类型不能位空") @Min(value = 1, message = "证件类型无效") @Max(value = 5, message = "证件类型无效")
...@@ -25,5 +26,6 @@ public class AdamEntersParam implements java.io.Serializable { ...@@ -25,5 +26,6 @@ public class AdamEntersParam implements java.io.Serializable {
@ApiModelProperty(position = 14, required = true, value = "入场人证件号[30]", example = "110101110001010111") @ApiModelProperty(position = 14, required = true, value = "入场人证件号[30]", example = "110101110001010111")
@Pattern(regexp = LnsRegex.Valid.LETTER_NUMBER, message = "证件号格式有误") @Pattern(regexp = LnsRegex.Valid.LETTER_NUMBER, message = "证件号格式有误")
@Size(min = 1, max = 30, message = "证件号长度限制1-30位") @Size(min = 1, max = 30, message = "证件号长度限制1-30位")
@NotBlank(message = "证件号不能为空")
private String idCard; private String idCard;
} }
...@@ -21,6 +21,7 @@ public class AdamMemberOrderCodeParam implements Serializable { ...@@ -21,6 +21,7 @@ public class AdamMemberOrderCodeParam implements Serializable {
private String memberCode; private String memberCode;
@ApiModelProperty(position = 12, required = true, value = "生日", example = "2021-05-27") @ApiModelProperty(position = 12, required = true, value = "生日", example = "2021-05-27")
@Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
@NotBlank(message = "生日不能为空")
private String birthday; private String birthday;
@ApiModelProperty(position = 12, value = "支付终端[app,wap,js,applet]", example = "js") @ApiModelProperty(position = 12, value = "支付终端[app,wap,js,applet]", example = "js")
private String deviceFrom; private String deviceFrom;
......
...@@ -31,12 +31,15 @@ public class AdamMemberOrderParam implements Serializable { ...@@ -31,12 +31,15 @@ public class AdamMemberOrderParam implements Serializable {
private BigDecimal pricePaid; private BigDecimal pricePaid;
@ApiModelProperty(position = 15, required = true, value = "用户生日", example = "2021-05-27") @ApiModelProperty(position = 15, required = true, value = "用户生日", example = "2021-05-27")
@Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
@NotBlank(message = "生日不能为空")
private String birthday; private String birthday;
@ApiModelProperty(position = 16, required = true, value = "支付终端", allowableValues = "app,wap,js,applet") @ApiModelProperty(position = 16, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
@Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效") @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效")
@NotBlank(message = "支付终端不能为空")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(position = 17, required = true, value = "支付方式", allowableValues = "alipay,wepay") @ApiModelProperty(position = 17, required = true, value = "支付方式", allowableValues = "alipay,wepay")
@Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效") @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效")
@NotBlank(message = "支付方式不能为空")
private String payType; private String payType;
@ApiModelProperty(position = 18, required = false, value = "App内Apple支付必传") @ApiModelProperty(position = 18, required = false, value = "App内Apple支付必传")
private String productId; private String productId;
......
...@@ -24,6 +24,7 @@ public class AdamThirdPartParam implements Serializable { ...@@ -24,6 +24,7 @@ public class AdamThirdPartParam implements Serializable {
private String avatar; private String avatar;
@ApiModelProperty(position = 14, required = true, value = "平台类型[255]", allowableValues = "WEIBO,WECHAT,QQ") @ApiModelProperty(position = 14, required = true, value = "平台类型[255]", allowableValues = "WEIBO,WECHAT,QQ")
@Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_ULGOIN, message = "平台类型无效") @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_ULGOIN, message = "平台类型无效")
@NotBlank(message = "平台类型不能为空")
private String platform; private String platform;
@ApiModelProperty(position = 15, required = false, value = "手机号[新账号时必传]") @ApiModelProperty(position = 15, required = false, value = "手机号[新账号时必传]")
private String mobile; private String mobile;
......
...@@ -31,6 +31,7 @@ public class AdamUserInfoParam implements java.io.Serializable { ...@@ -31,6 +31,7 @@ public class AdamUserInfoParam implements java.io.Serializable {
private AdamTagVo sex; private AdamTagVo sex;
@ApiModelProperty(position = 15, required = true, value = "生日[YYYY-MM-DD]", example = "2021-05-17") @ApiModelProperty(position = 15, required = true, value = "生日[YYYY-MM-DD]", example = "2021-05-17")
@Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
@NotBlank(message = "生日不能为空")
private String birthday; private String birthday;
@ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]", example = "北京 北京市 朝阳区") @ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]", example = "北京 北京市 朝阳区")
@NotBlank(message = "常住地不能为空") @NotBlank(message = "常住地不能为空")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment