From 6c340588edca370436c38f0b146e0edadcd32ff9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 18 Mar 2026 16:22:15 +0800
Subject: [PATCH] fix(yinhe): 修复AI服务响应状态和排序问题
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 137 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 62 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 5a3b9cc..52e8a8b 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -2,16 +2,16 @@
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.entity.MallOrderItem;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.entity.*;
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 cn.hutool.core.util.ObjectUtil;
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;
@@ -24,67 +24,80 @@
**/
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "false")
public class OrderOvertimeJob {
- @Autowired
- private MallOrderInfoMapper orderInfoMapper;
-
- @Autowired
- private MallMemberMapper mallMemberMapper;
-
- @Autowired
- private MallOrderItemMapper mallOrderItemMapper;
-
- @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() + "库存不足");
- }
- }
- }
- }
- }
-
- }
-
+// @Autowired
+// private MallOrderInfoMapper orderInfoMapper;
+//
+// @Autowired
+// private MallMemberMapper mallMemberMapper;
+//
+// @Autowired
+// private MallOrderItemMapper mallOrderItemMapper;
+//
+// @Autowired
+// private MallGoodsMapper mallGoodsMapper;
+//
+// @Autowired
+// private MallGoodsSkuMapper mallGoodsSkuMapper;
+//
+// @Autowired
+// private MallMemberCouponMapper mallMemberCouponMapper;
+//
+// @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() + "库存不足");
+// }
+// Long memberCouponId = mallOrderItem.getMemberCouponId();
+// MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
+// if(ObjectUtil.isNotEmpty(mallMemberCoupon)){
+// mallMemberCoupon.setState(1);
+// mallMemberCouponMapper.updateById(mallMemberCoupon);
+// }
+// }
+// }
+// }
+// }
+//
+// }
+//
+//
+//
+// @Autowired
+// private RedisUtils redisUtils;
+//
// @Scheduled(cron = "0/5 * * * * ? ")
// public void wakeup() {
-// log.info("本地保持唤醒状态");
-// Long id = 5L;
-// mallMemberMapper.selectById(id);
+// redisUtils.set("wakeup", "wakeup");
// }
}
--
Gitblit v1.9.1