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

Commit 5576fcf5 authored by zhangguobing's avatar zhangguobing

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

parent e598ec9a
...@@ -259,8 +259,8 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -259,8 +259,8 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
skuInfoVo.setUseScope(Integer.valueOf(addSkuParam.getUseScope())); skuInfoVo.setUseScope(Integer.valueOf(addSkuParam.getUseScope()));
skuInfoVo.setValFace(addSkuParam.getValFace()); skuInfoVo.setValFace(addSkuParam.getValFace());
skuInfoVo.setValidity(-1); skuInfoVo.setValidity(-1);
skuInfoVo.setEffectAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(addSkuParam.getEffectTime())); skuInfoVo.setEffectAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(addSkuParam.getEffectAt()));
skuInfoVo.setExpireAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(addSkuParam.getExpireTime())); skuInfoVo.setExpireAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(addSkuParam.getExpireAt()));
} }
if (StringUtils.isBlank(addSkuParam.getSkuId())) { if (StringUtils.isBlank(addSkuParam.getSkuId())) {
skuInfoVo.setSkuId(goodsInfoVo.getSpuId().concat(StringUtils.right(String.valueOf(System.nanoTime()), 5))); skuInfoVo.setSkuId(goodsInfoVo.getSpuId().concat(StringUtils.right(String.valueOf(System.nanoTime()), 5)));
......
...@@ -89,9 +89,9 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -89,9 +89,9 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
@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 effectAt;
@ApiModelProperty(position = 32, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-12-31 00:00:00") @ApiModelProperty(position = 32, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-12-31 00:00:00")
@Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "结束时间格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "结束时间格式有误")
@NotNull(message = "参数'结束时间'不可为空") @NotNull(message = "参数'结束时间'不可为空")
private String expireTime; private String expireAt;
} }
...@@ -54,11 +54,11 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -54,11 +54,11 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
@ApiModelProperty(position = 18, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-01-01 00:00:00") @ApiModelProperty(position = 18, 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 effectAt;
@ApiModelProperty(position = 19, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-12-31 00:00:00") @ApiModelProperty(position = 19, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-12-31 00:00:00")
@Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "结束时间格式有误") @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "结束时间格式有误")
@NotNull(message = "参数'结束时间'不可为空") @NotNull(message = "参数'结束时间'不可为空")
private String expireTime; private String expireAt;
public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo() { public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo() {
...@@ -72,8 +72,8 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -72,8 +72,8 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
goodsSkuInfoVo.setIsTrueName(Integer.valueOf(this.getIsTrueName())); goodsSkuInfoVo.setIsTrueName(Integer.valueOf(this.getIsTrueName()));
goodsSkuInfoVo.setUseScope(Integer.valueOf(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.getEffectAt()));
goodsSkuInfoVo.setExpireAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getExpireTime())); goodsSkuInfoVo.setExpireAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getExpireAt()));
return goodsSkuInfoVo; return goodsSkuInfoVo;
} }
} }
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