From 94226773a6ef8f3e04121772a7c223c38af3d15b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 07 Dec 2023 10:05:53 +0800
Subject: [PATCH] 用户留言

---
 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java |   70 ++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
index a6a9c01..e67637f 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -57,43 +58,44 @@
     private IMallAchieveService mallAchieveService;
 
     /**
-     * 普通商品结算
+     * 普通商品结算 -- 10天结算一次
      */
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void normalGoodsSettlementJob() {
-        log.info("普通商品结算");
-        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderInfoWithNormalGoods(DateUtil.offsetDay(new Date(), -10));
-        if (CollUtil.isEmpty(orderInfos)) {
-            return;
-        }
-
-        for (MallOrderInfo orderInfo : orderInfos) {
-            MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
-            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
-                continue;
-            }
-
-            for (MallOrderItem item : orderInfo.getItems()) {
-                MallGoodsSku sku = mallGoodsSkuMapper.selectById(item.getSkuId());
-                BigDecimal score = sku.getPresentPrice();
-
-                memberWalletService.add(score, member.getId(), "score");
-                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
-                mallAchieveService.add(item.getId());
-            }
-
-            // 普通商品动态分红结算
-            memberProfitService.dynamicProfit(orderInfo.getId(), 1);
-        }
-    }
+//    @Scheduled(cron = "0 0 0 * * ?")
+//    @Transactional(rollbackFor = Exception.class)
+//    public void normalGoodsSettlementJob() {
+//        log.info("普通商品结算");
+//        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderInfoWithNormalGoods(DateUtil.offsetDay(new Date(), -10));
+//        if (CollUtil.isEmpty(orderInfos)) {
+//            return;
+//        }
+//
+//        for (MallOrderInfo orderInfo : orderInfos) {
+//            MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
+//            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
+//                continue;
+//            }
+//
+//            for (MallOrderItem item : orderInfo.getItems()) {
+//                MallGoodsSku sku = mallGoodsSkuMapper.selectById(item.getSkuId());
+//                BigDecimal score = sku.getPresentPrice();
+//
+//                memberWalletService.add(score, member.getId(), "score");
+//                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+//
+//                mallAchieveService.add(item.getId());
+//            }
+//
+//            // 普通商品动态分红结算
+//            memberProfitService.dynamicProfit(orderInfo.getId(), 1);
+//        }
+//    }
 
     /**
      * 自动确认收货
      */
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void orderAutoConfirmJob() {
-        log.info("自动确认收货");
-        mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -7));
-    }
+//    @Scheduled(cron = "0 0 0 * * ?")
+//    public void orderAutoConfirmJob() {
+//        log.info("自动确认收货");
+//        mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -7));
+//    }
 }

--
Gitblit v1.9.1