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

Commit 9cdbece8 authored by zhangguobing's avatar zhangguobing

~api:券商品业务-商品上架编辑参数校验调整,商品详情返回字段调整;

parent d76606f3
...@@ -78,7 +78,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -78,7 +78,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
* ---------------------------- 价格库存 ---------------------------- * ---------------------------- 价格库存 ----------------------------
**/ **/
@ApiModelProperty(position = 23, required = true, value = "规格展现方式[1-常规|2-组合]", allowableValues = "1,2", example = "1") @ApiModelProperty(position = 23, required = false, value = "规格展现方式[1-常规|2-组合]", allowableValues = "1,2", example = "1")
@NotBlank(message = "规格展现方式不能为空") @NotBlank(message = "规格展现方式不能为空")
@Pattern(regexp = "\\b(1|2)\\b", message = "规格展现方式参数无效") @Pattern(regexp = "\\b(1|2)\\b", message = "规格展现方式参数无效")
private String specMode; private String specMode;
...@@ -86,13 +86,13 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -86,13 +86,13 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
// @NotNull(message = "SKU规格信息不能为空") // @NotNull(message = "SKU规格信息不能为空")
@Valid @Valid
private GoblinStoreMgtGoodsCouponAddSkuParam skuParam; private GoblinStoreMgtGoodsCouponAddSkuParam skuParam;
@ApiModelProperty(position = 25, required = true, value = "物流模版", example = "松鼠德邦") @ApiModelProperty(position = 25, required = false, value = "物流模版", example = "松鼠德邦")
@Size(max = 50, message = "物流模版ID过长") @Size(max = 50, message = "物流模版ID过长")
private String logisticsTemplate;//- private String logisticsTemplate;//-
@ApiModelProperty(position = 26, required = false, value = "商品编码[默认为系统编码,也可手动输入商家自己的编码]") @ApiModelProperty(position = 26, required = false, value = "商品编码[默认为系统编码,也可手动输入商家自己的编码]")
@Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, message = "商品编码格式或长度有误") @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, message = "商品编码格式或长度有误")
private String spuNo; private String spuNo;
@ApiModelProperty(position = 26, required = true, value = "ERP类型[WANGDIAN-旺店通]") @ApiModelProperty(position = 26, required = false, value = "ERP类型[WANGDIAN-旺店通]")
@Pattern(regexp = "\\b(WANGDIAN)\\b", message = "ERP类型无效") @Pattern(regexp = "\\b(WANGDIAN)\\b", message = "ERP类型无效")
private String erpType;//- private String erpType;//-
@ApiModelProperty(position = 26, required = false, value = "ERP货品编号[商品对应在ERP的商品编码,默认为空]") @ApiModelProperty(position = 26, required = false, value = "ERP货品编号[商品对应在ERP的商品编码,默认为空]")
...@@ -121,7 +121,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -121,7 +121,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
@ApiModelProperty(position = 30, required = false, value = "商品有效期[yyyy-MM-dd]") @ApiModelProperty(position = 30, required = false, value = "商品有效期[yyyy-MM-dd]")
@Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "商品有效期格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "商品有效期格式有误")
private String spuValidity; private String spuValidity;
@ApiModelProperty(position = 31, required = true, value = "是否虚拟商品[0-否|1-是]", allowableValues = "0,1", example = "0") @ApiModelProperty(position = 31, required = false, value = "是否虚拟商品[0-否|1-是]", allowableValues = "0,1", example = "0")
@Pattern(regexp = "\\b(0|1)\\b", message = "是否虚拟商品参数无效") @Pattern(regexp = "\\b(0|1)\\b", message = "是否虚拟商品参数无效")
private String virtualFlg;//---默认1 private String virtualFlg;//---默认1
......
...@@ -26,16 +26,16 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -26,16 +26,16 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
@ApiModelProperty(position = 13, required = false, value = "ERP商家编码") @ApiModelProperty(position = 13, required = false, value = "ERP商家编码")
@Size(max = 40, message = "ERP商家编码长度限制40") @Size(max = 40, message = "ERP商家编码长度限制40")
private String skuErpCode;//- private String skuErpCode;//-
@ApiModelProperty(position = 14, value = "ERP托管[0-否|1-是],默认0") @ApiModelProperty(position = 14, required = false, value = "ERP托管[0-否|1-是],默认0")
@Pattern(regexp = "\\b(0|1)\\b", message = "ERP托管参数无效") @Pattern(regexp = "\\b(0|1)\\b", message = "ERP托管参数无效")
private String erpHosting;//- private String erpHosting;//-
@ApiModelProperty(position = 15, required = false, value = "ERP仓库编号") @ApiModelProperty(position = 15, required = false, value = "ERP仓库编号")
@Size(max = 40, message = "ERP仓库编号长度限制40") @Size(max = 40, message = "ERP仓库编号长度限制40")
private String erpWarehouseNo;//- private String erpWarehouseNo;//-
@ApiModelProperty(position = 16, required = true, value = "单品默认图片的url[256]") @ApiModelProperty(position = 16, required = false, value = "单品默认图片的url[256]")
@NotBlank(message = "单品图片不能为空") @NotBlank(message = "单品图片不能为空")
private String skuPic; private String skuPic;
@ApiModelProperty(position = 12, required = true, value = "单品规格信息") @ApiModelProperty(position = 12, required = false, value = "单品规格信息")
@NotNull(message = "规格信息不能为空") @NotNull(message = "规格信息不能为空")
// @Valid// 初始化写死['规格':'张'] // @Valid// 初始化写死['规格':'张']
private List<GoblinGoodsSpecDto> skuSpecList; private List<GoblinGoodsSpecDto> skuSpecList;
...@@ -46,7 +46,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -46,7 +46,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
@Digits(integer = 6, fraction = 2, message = "参数'单品现价'无效") @Digits(integer = 6, fraction = 2, message = "参数'单品现价'无效")
@DecimalMin(value = "0.01", message = "参数'单品现价'必须为大于0") @DecimalMin(value = "0.01", message = "参数'单品现价'必须为大于0")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty(position = 20, required = true, value = "单品会员价格[20,2]") @ApiModelProperty(position = 20, required = false, value = "单品会员价格[20,2]")
@NotNull(message = "单品会员价格不能为空") @NotNull(message = "单品会员价格不能为空")
@Min(value = 0, message = "单品会员价格不能小于0") @Min(value = 0, message = "单品会员价格不能小于0")
private BigDecimal priceMember; private BigDecimal priceMember;
...@@ -59,7 +59,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -59,7 +59,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
private Integer warningStock; private Integer warningStock;
@ApiModelProperty(position = 22, required = false, value = "ISBN,针对CD/图书等[100]") @ApiModelProperty(position = 22, required = false, value = "ISBN,针对CD/图书等[100]")
private String skuIsbn;//- private String skuIsbn;//-
@ApiModelProperty(position = 23, required = true, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]") @ApiModelProperty(position = 23, required = false, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
@NotNull(message = "购买限制不能为空") @NotNull(message = "购买限制不能为空")
private String buyFactor; private String buyFactor;
@ApiModelProperty(position = 24, required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]") @ApiModelProperty(position = 24, required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
...@@ -76,17 +76,17 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -76,17 +76,17 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
* ---------------------------- 券类商品-代金券属性 ---------------------------- * ---------------------------- 券类商品-代金券属性 ----------------------------
*/ */
@ApiModelProperty(position = 28, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1") @ApiModelProperty(position = 28, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", allowableValues = "0,1", example = "1")
@Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效") @Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效")
private Integer isTrueName; private Integer isTrueName;
@ApiModelProperty(position = 29, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]") @ApiModelProperty(position = 29, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]", allowableValues = "101,102,103", example = "101")
@Pattern(regexp = "\\b(101|102|103)\\b", message = "参数'适用范围'无效") @Pattern(regexp = "\\b(101|102|103)\\b", message = "参数'适用范围'无效")
private Integer useScope; private Integer useScope;
@ApiModelProperty(position = 30, required = true, value = "面值", example = "99.00") @ApiModelProperty(position = 30, required = true, value = "面值", example = "99.00")
@Digits(integer = 3, fraction = 2, message = "参数'面值'无效") @Digits(integer = 3, fraction = 2, message = "参数'面值'无效")
@DecimalMin(value = "0.01", message = "参数'面值'必须为大于0") @DecimalMin(value = "0.01", message = "参数'面值'必须为大于0")
private BigDecimal valFace; private BigDecimal valFace;
@ApiModelProperty(position = 31, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-01-01 00:00:00") @ApiModelProperty(position = 31, required = true, value = "开始时间[yyyy-MM-dd HH:mm:ss]", example = "2024-01-01 00:00:00")
@Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "开始时间格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "开始时间格式有误")
@NotNull(message = "参数'开始时间'不可为空") @NotNull(message = "参数'开始时间'不可为空")
private String effectTime; private String effectTime;
......
...@@ -45,6 +45,8 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable { ...@@ -45,6 +45,8 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
private Integer buyLimit; private Integer buyLimit;
@ApiModelProperty(position = 27, value = "剩余库存") @ApiModelProperty(position = 27, value = "剩余库存")
private Integer restStock; private Integer restStock;
@ApiModelProperty(position = 51, value = "是否实名[0-否|1-是,表示该商品需要实名关联]")
private Integer isTrueName;
private static final GoblinGoodsSkuInfoDetailVo obj = new GoblinGoodsSkuInfoDetailVo(); private static final GoblinGoodsSkuInfoDetailVo obj = new GoblinGoodsSkuInfoDetailVo();
......
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