From ab1e9f806f5066e0e5ef4195ee72af9d302d4e60 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 19 Jan 2022 14:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=97=B6=E7=9A=84=E7=94=9F=E6=88=90=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E4=BF=83=E9=94=80=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E7=B4=A2=E5=BC=95=E4=BF=83=E9=94=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=9C=A8=E4=BA=8B=E5=8A=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=90=8E=E5=8F=91=E9=80=81mq=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/src/main/java/cn/lili/common/utils/SnowFlake.java   | 1 -
 .../cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java   | 1 +
 .../lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java   | 4 +++-
 .../listener/UpdateEsGoodsIndexPromotionsListener.java        | 2 +-
 .../lili/modules/promotion/serviceimpl/CouponServiceImpl.java | 1 -
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/utils/SnowFlake.java b/framework/src/main/java/cn/lili/common/utils/SnowFlake.java
index 18379ea7..e3cb3d70 100644
--- a/framework/src/main/java/cn/lili/common/utils/SnowFlake.java
+++ b/framework/src/main/java/cn/lili/common/utils/SnowFlake.java
@@ -33,7 +33,6 @@ public class SnowFlake {
      */
     public static void initialize(long workerId, long datacenterId) {
         snowflake = IdUtil.getSnowflake(workerId, datacenterId);
-        log.error(workerId+""+datacenterId);
     }
 
     public static long getId() {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
index 90ebd4c4..6a68590a 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
@@ -383,6 +383,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateStock(String goodsId, Integer quantity) {
         LambdaUpdateWrapper<Goods> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
         lambdaUpdateWrapper.set(Goods::getQuantity, quantity);
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
index cce00a75..40cc4192 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -131,6 +131,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void update(List<Map<String, Object>> skuList, Goods goods, Boolean regeneratorSkuFlag) {
         // 是否存在规格
         if (skuList == null || skuList.isEmpty()) {
@@ -577,7 +578,8 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
      * @param skuList sku列表
      * @param goods   商品信息
      */
-    private List<GoodsSku> addGoodsSku(List<Map<String, Object>> skuList, Goods goods) {
+    @Transactional(rollbackFor = Exception.class)
+    List<GoodsSku> addGoodsSku(List<Map<String, Object>> skuList, Goods goods) {
         List<GoodsSku> skus = new ArrayList<>();
         for (Map<String, Object> skuVO : skuList) {
             Map<String, Object> resultMap = this.add(skuVO, goods);
diff --git a/framework/src/main/java/cn/lili/modules/promotion/listener/UpdateEsGoodsIndexPromotionsListener.java b/framework/src/main/java/cn/lili/modules/promotion/listener/UpdateEsGoodsIndexPromotionsListener.java
index 06b20cab..00417c5f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/listener/UpdateEsGoodsIndexPromotionsListener.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/listener/UpdateEsGoodsIndexPromotionsListener.java
@@ -29,7 +29,7 @@ public class UpdateEsGoodsIndexPromotionsListener {
     private RocketmqCustomProperties rocketmqCustomProperties;
 
 
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true)
     public void updateEsGoodsIndexPromotions(UpdateEsGoodsIndexPromotionsEvent event) {
         //更新商品促销消息
         String destination = rocketmqCustomProperties.getGoodsTopic() + ":" + GoodsTagsEnum.UPDATE_GOODS_INDEX_PROMOTIONS.name();
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
index 2c2715e8..076d45ea 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
@@ -249,7 +249,6 @@ public class CouponServiceImpl extends AbstractPromotionsServiceImpl<CouponMappe
      * @param promotions 优惠券信息
      */
     @Override
-    @Transactional(rollbackFor = {Exception.class})
     public void updateEsGoodsIndex(Coupon promotions) {
         Coupon coupon = JSONUtil.parse(promotions).toBean(Coupon.class);
         super.updateEsGoodsIndex(coupon);