From 3a14e96c5dcd2e521bb8b9b01dd5e1b921f5e368 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 26 Aug 2021 15:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E6=AE=B5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/common/enums/ResultCode.java |  1 +
 .../java/cn/lili/common/utils/DateUtil.java   |  2 ++
 .../service/PromotionGoodsService.java        |  7 -----
 .../PromotionGoodsServiceImpl.java            | 29 -------------------
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 1279560a..8ee1d411 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -310,6 +310,7 @@ public enum ResultCode {
     /**
      * 秒杀
      */
+    SECKILL_NOT_START_ERROR(45000, "今日没有限时抢购活动，请明天再来看看吧。"),
     SECKILL_NOT_EXIST_ERROR(45001, "当前参与的秒杀活动不存在！"),
     SECKILL_UPDATE_ERROR(45002, "当前秒杀活动活动已经开始，无法修改！"),
     SECKILL_PRICE_ERROR(45003, "活动价格不能大于商品原价"),
diff --git a/framework/src/main/java/cn/lili/common/utils/DateUtil.java b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
index 769c312f..306cc0cd 100644
--- a/framework/src/main/java/cn/lili/common/utils/DateUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
@@ -36,6 +36,7 @@ public class DateUtil {
 
     /**
      * 当天的开始时间
+     *
      * @param date 时间
      * @return 根据传入的时间获取开始时间
      */
@@ -79,6 +80,7 @@ public class DateUtil {
 
     /**
      * 当天的结束时间
+     *
      * @param date 传入日期
      * @return 获得传入日期当天结束时间
      */
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java
index b801e5f1..c134d2f3 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java
@@ -49,13 +49,6 @@ public interface PromotionGoodsService extends IService<PromotionGoods> {
      */
     void updatePromotion(CartSkuVO cartSkuVO);
 
-    /**
-     * 获取购物车商品的促销活动
-     *
-     * @param cartSkuVO 购物车中的产品
-     */
-    void getCartSkuPromotion(CartSkuVO cartSkuVO);
-
     /**
      * 获取某sku当日所有活动
      *
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
index 3e6982e3..b8189ea1 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
@@ -148,35 +148,6 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
         }
     }
 
-    /**
-     * 获取购物车商品的促销活动
-     *
-     * @param cartSkuVO 购物车中的产品
-     */
-    @Override
-    public void getCartSkuPromotion(CartSkuVO cartSkuVO) {
-
-        updatePromotion(cartSkuVO);
-
-        Date date = DateUtil.getCurrentDayEndTime();
-
-
-        LambdaQueryWrapper<PromotionGoods> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PromotionGoods::getSkuId, cartSkuVO.getGoodsSku().getId())
-                .eq(PromotionGoods::getPromotionStatus, PromotionStatusEnum.START.name())
-                .le(PromotionGoods::getStartTime, date);
-        //获取有效的促销活动
-        List<PromotionGoods> promotionGoods = this.list(queryWrapper);
-        //同步查询缓存中的促销活动商品的库存
-        for (PromotionGoods promotionGood : promotionGoods) {
-            Integer goodsStock = this.getPromotionGoodsStock(PromotionTypeEnum.valueOf(promotionGood.getPromotionType()), promotionGood.getPromotionId(), promotionGood.getSkuId());
-            promotionGood.setQuantity(goodsStock);
-        }
-        cartSkuVO.setPromotions(promotionGoods);
-        //下一次更新时间
-        cartSkuVO.setUpdatePromotionTime(date);
-    }
-
     @Override
     public List<PromotionGoods> getPromotionGoods(String skuId) {
         long currTime = DateUtil.getDateline();