From 66b2f1f55d87b24524c33f2d54f355e674acf306 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 3 Mar 2022 11:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4=EF=BC=8C=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/SeckillApplyServiceImpl.java    | 17 ++++++++++++-----
 .../serviceimpl/SeckillServiceImpl.java         |  3 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
index 32163415..9e757376 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
@@ -235,7 +235,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
      *
      * @param seckillId 秒杀活动id
      * @param skuId     商品skuId
-     * @param saleNum  库存
+     * @param saleNum   库存
      */
     @Override
     public void updateSeckillApplySaleNum(String seckillId, String skuId, Integer saleNum) {
@@ -258,7 +258,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
         List<PromotionGoods> promotionGoodsList = new ArrayList<>();
         LambdaQueryWrapper<SeckillApply> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SeckillApply::getSeckillId, seckill.getId());
-        List<SeckillApply> list = this.list(queryWrapper);
+        List<SeckillApply> list = this.list(queryWrapper).stream().filter(i -> i.getTimeLine() != null && seckill.getHours().contains(i.getTimeLine().toString())).collect(Collectors.toList());
         for (SeckillApply seckillApply : list) {
             //获取参与活动的商品信息
             GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(seckillApply.getSkuId());
@@ -270,13 +270,20 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
         if (!promotionGoodsList.isEmpty()) {
             PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams();
             searchParams.setPromotionType(PromotionTypeEnum.SECKILL.name());
-            searchParams.setSkuIds(promotionGoodsList.stream().map(PromotionGoods::getSkuId).collect(Collectors.toList()));
+            searchParams.setPromotionId(seckill.getId());
             promotionGoodsService.deletePromotionGoods(searchParams);
             //初始化促销商品
-            PromotionTools.promotionGoodsInit(promotionGoodsList, seckill, PromotionTypeEnum.SECKILL);
-            result = promotionGoodsService.saveBatch(promotionGoodsList);
+            List<PromotionGoods> promotionGoods = PromotionTools.promotionGoodsInit(promotionGoodsList, seckill, PromotionTypeEnum.SECKILL);
+            result = promotionGoodsService.saveBatch(promotionGoods);
             this.seckillService.updateEsGoodsSeckill(seckill, list);
         }
+
+        LambdaQueryWrapper<SeckillApply> deleteWrapper = new LambdaQueryWrapper<>();
+        deleteWrapper.eq(SeckillApply::getSeckillId, seckill.getId());
+        deleteWrapper.notIn(SeckillApply::getSkuId, promotionGoodsList.stream().map(PromotionGoods::getSkuId).collect(Collectors.toList()));
+        this.remove(deleteWrapper);
+        seckillService.updateSeckillGoodsNum(seckill.getId());
+
         return result;
     }
 
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 8b092527..4341caaf 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
@@ -144,9 +144,10 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
      * @return 是否更新成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updatePromotions(Seckill promotions) {
         seckillApplyService.updateSeckillApplyTime(promotions);
-        return super.updatePromotions(promotions);
+        return this.saveOrUpdate(promotions);
     }
 
     /**