From 348f362b3048fc8a0be14cbfd09488e87733d5ee Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Mon, 7 Mar 2022 14:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E7=A7=92=E6=9D=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/cart/render/impl/SkuPromotionRender.java   | 2 +-
 .../cn/lili/modules/order/cart/service/CartServiceImpl.java  | 1 -
 .../promotion/serviceimpl/PromotionGoodsServiceImpl.java     | 2 --
 .../modules/promotion/serviceimpl/PromotionServiceImpl.java  | 2 --
 .../modules/promotion/serviceimpl/SeckillServiceImpl.java    | 5 ++++-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
index 82f3cde9..765b9192 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
@@ -74,7 +74,7 @@ public class SkuPromotionRender implements CartRenderStep {
         renderBasePrice(tradeDTO);
         //渲染单品促销
         renderSkuPromotion(tradeDTO);
-
+        //检查促销库存
         checkPromotionQuantity(tradeDTO);
 
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
index 1e8367ce..ccf3e7d8 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
@@ -185,7 +185,6 @@ public class CartServiceImpl implements CartService {
 
                 //购物车中不存在此商品，则新建立一个
                 CartSkuVO cartSkuVO = new CartSkuVO(dataSku, promotionMap);
-                this.checkSetGoodsQuantity(cartSkuVO, skuId, num);
                 cartSkuVO.setCartType(cartTypeEnum);
                 //检测购物车数据
                 checkCart(cartTypeEnum, cartSkuVO, skuId, num);
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 21917405..cc2a993f 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
@@ -232,8 +232,6 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
             this.update(updateWrapper);
             stringRedisTemplate.opsForValue().set(promotionStockKey, promotionGoods.getQuantity().toString());
         }
-
-
     }
 
     /**
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java
index cd0df5e8..f68b0506 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java
@@ -150,7 +150,6 @@ public class PromotionServiceImpl implements PromotionService {
         searchParams.setSkuId(promotionGoods.getSkuId());
         List<SeckillApply> seckillApplyList = seckillApplyService.getSeckillApplyList(searchParams);
         if (seckillApplyList != null && !seckillApplyList.isEmpty()) {
-            SeckillApply seckillApply = seckillApplyList.get(0);
             String[] split = seckill.getHours().split(",");
             int[] hoursSored = Arrays.stream(split).mapToInt(Integer::parseInt).toArray();
             Arrays.sort(hoursSored);
@@ -158,7 +157,6 @@ public class PromotionServiceImpl implements PromotionService {
             seckill.setEndTime(promotionGoods.getEndTime());
             promotionMap.put(esPromotionKey, seckill);
         }
-
     }
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
index 4341caaf..b344e684 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
@@ -146,8 +146,11 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updatePromotions(Seckill promotions) {
+        this.checkStatus(promotions);
+        this.checkPromotions(promotions);
+        boolean result = this.updateById(promotions);
         seckillApplyService.updateSeckillApplyTime(promotions);
-        return this.saveOrUpdate(promotions);
+        return result;
     }
 
     /**