From 6fa3077d830df8a20350837c424cc7f6e5549d6b Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 1 Sep 2020 10:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/domain/YxStoreSeckill.java        | 18 ------------------
 .../service/dto/YxStoreSeckillDto.java         |  9 ---------
 .../impl/YxStoreSeckillServiceImpl.java        |  5 -----
 .../activity/vo/YxStoreSeckillQueryVo.java     |  9 ---------
 4 files changed, 41 deletions(-)

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 a5e3f67c..797808ac 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
@@ -71,24 +71,6 @@ public class YxStoreSeckill extends BaseDomain {
     private String info;
 
 
-    /** 价格 */
-    @NotNull(message = "请输入秒杀价")
-    @DecimalMin(value="0.00", message = "秒杀价不在合法范围内" )
-    @DecimalMax(value="99999999.99", message = "秒杀价不在合法范围内")
-    @ApiModelProperty(value = "秒杀价")
-    private BigDecimal price;
-
-
-    /** 成本 */
-    @ApiModelProperty(value = "成本价")
-    private BigDecimal cost;
-
-
-    /** 原价 */
-    @ApiModelProperty(value = "原价")
-    private BigDecimal otPrice;
-
-
     /** 返多少积分 */
     @ApiModelProperty(value = "返多少积分")
     private BigDecimal giveIntegral;
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 8aca6e7b..d6cc5d1f 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
@@ -51,15 +51,6 @@ public class YxStoreSeckillDto implements Serializable {
     // 简介
     private String info;
 
-    // 价格
-    private BigDecimal price;
-
-    // 成本
-    private BigDecimal cost;
-
-    // 原价
-    private BigDecimal otPrice;
-
     // 返多少积分
     private BigDecimal giveIntegral;
 
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 1c25f3e8..7a4be7ae 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
@@ -217,9 +217,6 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
             map.put("轮播图", yxStoreSeckill.getImages());
             map.put("活动标题", yxStoreSeckill.getTitle());
             map.put("简介", yxStoreSeckill.getInfo());
-            map.put("价格", yxStoreSeckill.getPrice());
-            map.put("成本", yxStoreSeckill.getCost());
-            map.put("原价", yxStoreSeckill.getOtPrice());
             map.put("返多少积分", yxStoreSeckill.getGiveIntegral());
             map.put("排序", yxStoreSeckill.getSort());
             map.put("库存", yxStoreSeckill.getStock());
@@ -251,8 +248,6 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
             throw new YshopException("请上传轮播图");
         }
 
-        yxStoreSeckill.setPrice(BigDecimal.valueOf(resultDTO.getMinPrice()));
-        yxStoreSeckill.setCost(new BigDecimal(resultDTO.getMinCost()));
         yxStoreSeckill.setStock(resultDTO.getStock());
         yxStoreSeckill.setImages(String.join(",", resources.getImages()));
         this.saveOrUpdate(yxStoreSeckill);
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreSeckillQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreSeckillQueryVo.java
index 84833b75..40015363 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreSeckillQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreSeckillQueryVo.java
@@ -56,15 +56,6 @@ public class YxStoreSeckillQueryVo implements Serializable{
     @ApiModelProperty(value = "简介")
     private String info;
 
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "成本")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "原价")
-    private BigDecimal otPrice;
-
     @ApiModelProperty(value = "返多少积分")
     private BigDecimal giveIntegral;