From ba17eded418c7eb1a14cdcd16a4d60619da8db73 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Sep 2022 19:28:11 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
index 5430477..4064e7c 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -11,6 +11,7 @@
 import cn.hutool.core.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -23,6 +24,7 @@
  **/
 @Slf4j
 @Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
 public class OrderOvertimeJob {
 
     @Autowired
@@ -52,22 +54,23 @@
                     orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
                     orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
                     orderInfoMapper.updateById(orderInfo);
-                }
-                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
-                if(CollUtil.isNotEmpty(mallOrderItemList)){
-                    for(MallOrderItem mallOrderItem : mallOrderItemList){
-                        Long goodsId = mallOrderItem.getGoodsId();
-                        Long skuId = mallOrderItem.getSkuId();
-                        Integer cnt = mallOrderItem.getCnt();
-                        MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
-                        mallGoods.setVolume(mallGoods.getVolume() - cnt);
-                        mallGoods.setStock(mallGoods.getStock() + cnt);
-                        mallGoodsMapper.updateById(mallGoods);
 
-                        MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(skuId);
-                        mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - cnt);
-                        mallGoodsSku.setStock(mallGoodsSku.getStock() + cnt);
-                        mallGoodsSkuMapper.updateById(mallGoodsSku);
+                    List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
+                    if (CollUtil.isNotEmpty(mallOrderItemList)) {
+                        for (MallOrderItem mallOrderItem : mallOrderItemList) {
+                            Long goodsId = mallOrderItem.getGoodsId();
+                            Long skuId = mallOrderItem.getSkuId();
+                            Integer cnt = mallOrderItem.getCnt();
+                            MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
+                            mallGoods.setVolume(mallGoods.getVolume() - cnt);
+                            mallGoods.setStock(mallGoods.getStock() + cnt);
+                            mallGoodsMapper.updateById(mallGoods);
+
+                            MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(skuId);
+                            mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - cnt);
+                            mallGoodsSku.setStock(mallGoodsSku.getStock() + cnt);
+                            mallGoodsSkuMapper.updateById(mallGoodsSku);
+                        }
                     }
                 }
             }

--
Gitblit v1.9.1