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

Commit e598ec9a authored by zhangguobing's avatar zhangguobing

~api:券商品业务-完善创建逻辑;

parent c8c94236
...@@ -218,6 +218,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -218,6 +218,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
vo.setStoreId(this.getStoreId()); vo.setStoreId(this.getStoreId());
vo.setSpuId(this.getSpuId()); vo.setSpuId(this.getSpuId());
vo.setSpuNo(this.getSpuNo()); vo.setSpuNo(this.getSpuNo());
vo.setSpuType(2);
vo.setName(this.getName()); vo.setName(this.getName());
// vo.setSubtitle(this.getSubtitle()); // vo.setSubtitle(this.getSubtitle());
// vo.setSellPrice(this.getSellPrice()); // vo.setSellPrice(this.getSellPrice());
......
...@@ -43,10 +43,10 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -43,10 +43,10 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
@ApiModelProperty(position = 15, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1") @ApiModelProperty(position = 15, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1")
@Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效") @Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效")
private Integer isTrueName; private String isTrueName;
@ApiModelProperty(position = 16, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]") @ApiModelProperty(position = 16, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]")
@Pattern(regexp = "\\b(101|102|103)\\b", message = "参数'适用范围'无效") @Pattern(regexp = "\\b(101|102|103)\\b", message = "参数'适用范围'无效")
private Integer useScope; private String useScope;
@ApiModelProperty(position = 17, required = true, value = "面值", example = "99.00") @ApiModelProperty(position = 17, 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")
...@@ -63,13 +63,14 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -63,13 +63,14 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo() { public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo() {
GoblinGoodsSkuInfoVo goodsSkuInfoVo = GoblinGoodsSkuInfoVo.getNew(); GoblinGoodsSkuInfoVo goodsSkuInfoVo = GoblinGoodsSkuInfoVo.getNew();
goodsSkuInfoVo.setSkuType(2);
goodsSkuInfoVo.setSkuId(this.getSkuId()); goodsSkuInfoVo.setSkuId(this.getSkuId());
goodsSkuInfoVo.setPrice(this.getPrice()); goodsSkuInfoVo.setPrice(this.getPrice());
goodsSkuInfoVo.setPriceMember(this.getPrice()); goodsSkuInfoVo.setPriceMember(this.getPrice());
goodsSkuInfoVo.setStock(this.getStock()); goodsSkuInfoVo.setStock(this.getStock());
goodsSkuInfoVo.setSkuStock(this.getSkuStock()); goodsSkuInfoVo.setSkuStock(this.getSkuStock());
goodsSkuInfoVo.setIsTrueName(this.getIsTrueName()); goodsSkuInfoVo.setIsTrueName(Integer.valueOf(this.getIsTrueName()));
goodsSkuInfoVo.setUseScope(this.getUseScope()); goodsSkuInfoVo.setUseScope(Integer.valueOf(this.getUseScope()));
goodsSkuInfoVo.setValFace(this.getValFace()); goodsSkuInfoVo.setValFace(this.getValFace());
goodsSkuInfoVo.setEffectAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getEffectTime())); goodsSkuInfoVo.setEffectAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getEffectTime()));
goodsSkuInfoVo.setExpireAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getExpireTime())); goodsSkuInfoVo.setExpireAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getExpireTime()));
......
...@@ -153,8 +153,10 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable { ...@@ -153,8 +153,10 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
@ApiModelProperty(position = 33, value = "购买后(单位天)有效期,与生效/过期时间二选一") @ApiModelProperty(position = 33, value = "购买后(单位天)有效期,与生效/过期时间二选一")
private Integer validity; private Integer validity;
@ApiModelProperty(position = 33, value = "生效时间[yyyy-MM-dd HH:mm:ss]") @ApiModelProperty(position = 33, value = "生效时间[yyyy-MM-dd HH:mm:ss]")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime effectAt; private LocalDateTime effectAt;
@ApiModelProperty(position = 33, value = "过期时间[yyyy-MM-dd HH:mm:ss]") @ApiModelProperty(position = 33, value = "过期时间[yyyy-MM-dd HH:mm:ss]")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime expireAt; private LocalDateTime expireAt;
/** /**
* ---------------------------- 以上为券类商品-代金券属性 ---------------------------- * ---------------------------- 以上为券类商品-代金券属性 ----------------------------
......
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