From ff3834d97e67e7449a91d003b6f90860ac7b0fa2 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Tue, 8 Sep 2020 10:21:49 +0800 Subject: [PATCH] =?UTF-8?q?bug=E7=A7=92=E6=9D=80=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yixiang/modules/activity/domain/YxStoreCombination.java | 3 --- .../co/yixiang/modules/activity/domain/YxStoreSeckill.java | 3 --- .../modules/activity/rest/StoreCombinationController.java | 1 + .../yixiang/modules/activity/rest/StoreSeckillController.java | 1 + 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java index 7f5b02fe..40c3bfd7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java @@ -176,9 +176,6 @@ public class YxStoreCombination extends BaseDomain { @ApiModelProperty(value = "运费模板ID") private Long tempId; - /** 是否单独分佣 */ - @JsonProperty("is_sub") - private Integer isSub; /** 属性项目 */ @TableField(exist = false) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java index 1f4f1cc1..dc5e032d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java @@ -176,9 +176,6 @@ public class YxStoreSeckill extends BaseDomain { @ApiModelProperty(value = "运费模板ID") private Long tempId; - /** 是否单独分佣 */ - @JsonProperty("is_sub") - private Integer isSub; /** 属性项目 */ @TableField(exist = false) diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index f9e0dfa5..cf4fc4cc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -138,6 +138,7 @@ public class StoreCombinationController { .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) + .stock(Integer.valueOf(mapAttr.get("stock").toString())) .seckillPrice(Double.valueOf(mapAttr.get("seckill_price").toString())) .seckillStock(Integer.valueOf(mapAttr.get("seckill_stock").toString())) .build(); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index aec18484..dd04b06c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -149,6 +149,7 @@ public class StoreSeckillController { .barCode(mapAttr.get("bar_code").toString()) .weight(Double.valueOf(mapAttr.get("weight").toString())) .volume(Double.valueOf(mapAttr.get("volume").toString())) + .stock(Integer.valueOf(mapAttr.get("stock").toString())) .brokerage(Double.valueOf(mapAttr.get("brokerage").toString())) .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString()))