From c0e5c1f671f928161c28e93d00be40aa2a74ebc0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 10:23:33 +0800
Subject: [PATCH] 赠送积分更新状态

---
 src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java |   80 +++++++++++++++++++++++++++++-----------
 1 files changed, 58 insertions(+), 22 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 25b37a7..108967a 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -1,14 +1,18 @@
 package cc.mrbird.febs.mall.quartz;
 
 import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.mall.entity.MallGoods;
+import cc.mrbird.febs.mall.entity.MallGoodsSku;
 import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.entity.MallOrderItem;
+import cc.mrbird.febs.mall.mapper.*;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUnit;
 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;
 
@@ -21,6 +25,7 @@
  **/
 @Slf4j
 @Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
 public class OrderOvertimeJob {
 
     @Autowired
@@ -29,28 +34,59 @@
     @Autowired
     private MallMemberMapper mallMemberMapper;
 
-    @Scheduled(cron = "0 0/5 * * * ? ")
-    public void overtimeJob() {
-        log.info("订单超时任务执行");
-        List<MallOrderInfo> orderList = orderInfoMapper.selectOrderInfoByStatus(OrderStatusEnum.WAIT_PAY.getValue());
-        if (CollUtil.isNotEmpty(orderList)) {
-            for (MallOrderInfo orderInfo : orderList) {
-                long subTime = DateUtil.between(orderInfo.getOrderTime(), new Date(), DateUnit.MINUTE, false);
+    @Autowired
+    private MallOrderItemMapper mallOrderItemMapper;
 
-                if (subTime > 15) {
-                    orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
-                    orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
-                    orderInfoMapper.updateById(orderInfo);
-                }
-            }
-        }
+    @Autowired
+    private MallGoodsMapper mallGoodsMapper;
 
-    }
+    @Autowired
+    private MallGoodsSkuMapper mallGoodsSkuMapper;
+
+//    @Scheduled(cron = "0 0/5 * * * ? ")
+//    public void overtimeJob() {
+//        log.info("订单超时任务执行");
+//        List<MallOrderInfo> orderList = orderInfoMapper.selectOrderInfoUpTime(OrderStatusEnum.WAIT_PAY.getValue());
+//        if (CollUtil.isNotEmpty(orderList)) {
+//            for (MallOrderInfo orderInfo : orderList) {
+//                //更新订单状态
+//                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){
+//                        MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(mallOrderItem.getSkuId());
+//                        if (sku == null) {
+//                            throw new FebsException("购买商品或sku不存在");
+//                        }
+//
+////                        if (sku.getStock() < mallOrderItem.getCnt()) {
+////                            throw new FebsException(sku.getSkuName() + "库存不足");
+////                        }
+//
+//                        MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+//                        Integer goodsResult = mallGoodsMapper.updateStockAndVolumeByGoodsId(mallGoods.getId(), mallOrderItem.getCnt());
+//                        if(1 != goodsResult){
+//                            throw new FebsException(mallGoods.getGoodsName() + "库存不足");
+//                        }
+//
+//                        Integer skuResult = mallGoodsSkuMapper.updateStockAndVolumeBySkuId(sku.getId(),mallOrderItem.getCnt());
+//                        if(1 != skuResult){
+//                            throw new FebsException(sku.getSkuName() + "库存不足");
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//
+//    }
 
 //    @Scheduled(cron = "0/5 * * * * ? ")
-    public void wakeup() {
-        log.info("本地保持唤醒状态");
-        Long id = 5L;
-        mallMemberMapper.selectById(id);
-    }
+//    public void wakeup() {
+//        log.info("本地保持唤醒状态");
+//        Long id = 5L;
+//        mallMemberMapper.selectById(id);
+//    }
 }

--
Gitblit v1.9.1