From 72463407b4d6533d6bb26127cf59a18befbe061d Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Fri, 4 Sep 2020 10:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=90=A5=E9=94=80=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/domain/YxStoreCombination.java | 4 ++++ .../activity/domain/YxStoreSeckill.java | 18 ++++++++++++-- .../service/dto/YxStoreCombinationDto.java | 4 ++++ .../service/dto/YxStoreSeckillDto.java | 24 ++++++++++++++++--- .../impl/YxStoreSeckillServiceImpl.java | 3 +++ .../vo/YxStoreCombinationQueryVo.java | 5 ++++ .../activity/vo/YxStoreSeckillQueryVo.java | 5 ++++ 7 files changed, 58 insertions(+), 5 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 c59dbdba..7f5b02fe 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,6 +176,10 @@ public class YxStoreCombination extends BaseDomain { @ApiModelProperty(value = "运费模板ID") private Long tempId; + /** 是否单独分佣 */ + @JsonProperty("is_sub") + private Integer isSub; + /** 属性项目 */ @TableField(exist = false) @ApiModelProperty(value = "属性项目") 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 797808ac..1f4f1cc1 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 @@ -82,12 +82,20 @@ public class YxStoreSeckill extends BaseDomain { /** 库存 */ - @NotNull(message = "请输入库存") - @Min(message = "库存不能小于0",value = 1) @ApiModelProperty(value = "秒杀库存") private Integer stock; + /** 秒杀价 */ + @ApiModelProperty(value = "秒杀价") + private BigDecimal price; + /** 原价 */ + @ApiModelProperty(value = "原价") + private BigDecimal otPrice; + + /** 成本 */ + @ApiModelProperty(value = "成本") + private BigDecimal cost; /** 销量 */ @ApiModelProperty(value = "秒杀销量") private Integer sales; @@ -103,6 +111,8 @@ public class YxStoreSeckill extends BaseDomain { private BigDecimal postage; + + /** 内容 */ @NotBlank(message = "请填写详情") @ApiModelProperty(value = "详细内容") @@ -166,6 +176,10 @@ public class YxStoreSeckill extends BaseDomain { @ApiModelProperty(value = "运费模板ID") private Long tempId; + /** 是否单独分佣 */ + @JsonProperty("is_sub") + private Integer isSub; + /** 属性项目 */ @TableField(exist = false) @ApiModelProperty(value = "属性项目") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index 9f524549..9b40b0f6 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -125,6 +125,10 @@ public class YxStoreCombinationDto implements Serializable { @JsonProperty("temp_id") private Integer tempId; + /** 是否单独分佣 */ + @JsonProperty("is_sub") + private Integer isSub; + private ProductFormatDto attr; //属性项目 private List items; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java index d6cc5d1f..5619eb87 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java @@ -8,6 +8,7 @@ package co.yixiang.modules.activity.service.dto; import co.yixiang.modules.product.service.dto.FromatDetailDto; import co.yixiang.modules.product.service.dto.ProductFormatDto; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -54,15 +55,28 @@ public class YxStoreSeckillDto implements Serializable { // 返多少积分 private BigDecimal giveIntegral; + /** 秒杀价 */ + @ApiModelProperty(value = "秒杀价") + private BigDecimal price; + + /** 原价 */ + @ApiModelProperty(value = "原价") + private BigDecimal otPrice; + + /** 成本 */ + @ApiModelProperty(value = "成本") + private BigDecimal cost; + + /** 销量 */ + @ApiModelProperty(value = "秒杀销量") + private Integer sales; + // 排序 private Integer sort; // 库存 private Integer stock; - // 销量 - private Integer sales; - // 单位名 private String unitName; @@ -108,6 +122,10 @@ public class YxStoreSeckillDto implements Serializable { @JsonProperty("spec_type") private Integer specType; + /** 是否单独分佣 */ + @JsonProperty("is_sub") + private Integer isSub; + private ProductFormatDto attr; //属性项目 private List items; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index a95e562c..30dc6184 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -273,6 +273,9 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl