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

Commit 75d2e6f3 authored by zhangguobing's avatar zhangguobing

~api:券商品业务-完善编辑SKU;

parent b110912d
...@@ -305,7 +305,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -305,7 +305,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
skuInfoVo.setStatus("3");// 没有审核流程,默认通过 skuInfoVo.setStatus("3");// 没有审核流程,默认通过
// skuInfoVo.setReason(); // skuInfoVo.setReason();
skuInfoVo.setShelvesStatus(goodsInfoVo.getShelvesStatus()); skuInfoVo.setShelvesStatus(goodsInfoVo.getShelvesStatus());
skuInfoVo.setSkuAppear(StringUtils.isBlank(addSkuParam.getSkuAppear()) ? "0" : addSkuParam.getSkuAppear()); skuInfoVo.setSkuAppear("0");
skuInfoVo.setDelFlg("0"); skuInfoVo.setDelFlg("0");
// skuInfoVo.setShelvesAt(); // skuInfoVo.setShelvesAt();
skuInfoVo.setCreatedBy(goodsInfoVo.getCreatedBy()); skuInfoVo.setCreatedBy(goodsInfoVo.getCreatedBy());
......
...@@ -69,8 +69,8 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable { ...@@ -69,8 +69,8 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
// @ApiModelProperty(position = 26, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]") // @ApiModelProperty(position = 26, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]")
// @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "单品有效期格式有误") // @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "单品有效期格式有误")
// private String skuValidity; // private String skuValidity;
@ApiModelProperty(position = 27, required = false, value = "自定义展示[0-默认展示|1-隐藏不可购买]") // @ApiModelProperty(position = 27, required = false, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
private String skuAppear; // private String skuAppear;
/** /**
* ---------------------------- 券类商品-代金券属性 ---------------------------- * ---------------------------- 券类商品-代金券属性 ----------------------------
......
...@@ -28,34 +28,38 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -28,34 +28,38 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
@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 price; private BigDecimal price;
@ApiModelProperty(position = 14, required = true, value = "限量[0-无限制|X:限购数量]")
@Min(value = 0, message = "参数'限购数量'不能小于0")
@NotNull(message = "参数'限购数量'不可为空")
private Integer buyLimit;
@ApiModelProperty(position = 14, required = false, value = "总库存") @ApiModelProperty(position = 15, required = false, value = "总库存")
private Integer stock; private Integer stock;
@ApiModelProperty(position = 14, required = false, value = "总库存") @ApiModelProperty(position = 16, required = false, value = "总库存")
private Integer skuStock; private Integer skuStock;
@ApiModelProperty(position = 14, required = false, value = "加减库存") @ApiModelProperty(position = 17, required = false, value = "加减库存")
private Integer operStock; private Integer operStock;
/** /**
* ---------------------------- 券类商品-代金券属性 ---------------------------- * ---------------------------- 券类商品-代金券属性 ----------------------------
*/ */
@ApiModelProperty(position = 15, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1") @ApiModelProperty(position = 18, required = true, value = "是否实名[0-否|1-是,表示该商品需要实名关联]", example = "1")
@Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效") @Pattern(regexp = "\\b(0|1)\\b", message = "参数'是否实名'无效")
private String isTrueName; private String isTrueName;
@ApiModelProperty(position = 16, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]") @ApiModelProperty(position = 19, required = true, value = "适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]")
@Pattern(regexp = "\\b(101|102|103)\\b", message = "参数'适用范围'无效") @Pattern(regexp = "\\b(101|102|103)\\b", message = "参数'适用范围'无效")
private String useScope; private String useScope;
@ApiModelProperty(position = 17, required = true, value = "面值", example = "99.00") @ApiModelProperty(position = 20, 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 = 18, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-01-01 00:00:00") @ApiModelProperty(position = 21, 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 effectAt; private String effectAt;
@ApiModelProperty(position = 19, required = true, value = "结束时间[yyyy-MM-dd HH:mm:ss]", example = "2024-12-31 00:00:00") @ApiModelProperty(position = 22, 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 expireAt; private String expireAt;
...@@ -67,6 +71,7 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable { ...@@ -67,6 +71,7 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
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.setBuyLimit(this.getBuyLimit());
goodsSkuInfoVo.setStock(this.getStock()); goodsSkuInfoVo.setStock(this.getStock());
goodsSkuInfoVo.setSkuStock(this.getSkuStock()); goodsSkuInfoVo.setSkuStock(this.getSkuStock());
goodsSkuInfoVo.setIsTrueName(Integer.valueOf(this.getIsTrueName())); goodsSkuInfoVo.setIsTrueName(Integer.valueOf(this.getIsTrueName()));
......
...@@ -1376,7 +1376,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -1376,7 +1376,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
LinkedList<Object[]> updateGoodsSkuObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> updateGoodsSkuObjs = CollectionUtil.linkedListObjectArr();
updateGoodsSkuObjs.add(new Object[]{ updateGoodsSkuObjs.add(new Object[]{
updateSkuInfoVo.getPrice(), updateSkuInfoVo.getPriceMember(), updateSkuInfoVo.getStock(), updateSkuInfoVo.getSkuStock(), updateSkuInfoVo.getPrice(), updateSkuInfoVo.getPriceMember(), updateSkuInfoVo.getStock(), updateSkuInfoVo.getSkuStock(),
updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), skuId updateSkuInfoVo.getBuyLimit(), updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), skuId
}); });
toMqSqls.add(SqlMapping.get("goblin_goods_sku_coupon.update")); toMqSqls.add(SqlMapping.get("goblin_goods_sku_coupon.update"));
LinkedList<Object[]> updateGoodsSkuCouponObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> updateGoodsSkuCouponObjs = CollectionUtil.linkedListObjectArr();
......
...@@ -68,7 +68,7 @@ goblin_goods_sku.update_by_edit_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual ...@@ -68,7 +68,7 @@ goblin_goods_sku.update_by_edit_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual
goblin_goods_sku.update_by_edit_coupon_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual_flg=?,logistics_template=?,sku_pic=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' goblin_goods_sku.update_by_edit_coupon_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual_flg=?,logistics_template=?,sku_pic=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'
goblin_goods_sku.update_by_shelves=UPDATE goblin_goods_sku SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE sku_id=? AND store_id=? AND del_flg='0' goblin_goods_sku.update_by_shelves=UPDATE goblin_goods_sku SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE sku_id=? AND store_id=? AND del_flg='0'
goblin_goods_sku.update_by_soldout=UPDATE goblin_goods_sku SET soldout_status=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_soldout=UPDATE goblin_goods_sku SET soldout_status=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit_for_coupon=UPDATE goblin_goods_sku SET price=?,price_member=?,stock=?,sku_stock=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_edit_for_coupon=UPDATE goblin_goods_sku SET price=?,price_member=?,stock=?,sku_stock=?,buy_limit=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=? AND del_flg='0' goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=? AND del_flg='0'
goblin_goods_sku.update_by_del_spu=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND del_flg='0' goblin_goods_sku.update_by_del_spu=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND del_flg='0'
goblin_goods_sku.update_by_del=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_del=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE sku_id=? AND del_flg='0'
......
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