From ec00cb3e936147ae1c080cbb5d723ef368a3d2da Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 16:51:02 +0800
Subject: [PATCH] fix(mapper): 调整对话记录查询条件 - 移除了AiMemberTalkItemMapper中对state=1的限制 - 在AiMemberTalkMapper中增加了state=1的过滤条件 - 优化了对话记录的查询逻辑，确保数据准确性 - 统一了前后端对于对话状态的处理方式 - 提高了查询效率，减少了不必要的数据加载 - 保证了对话列表按创建时间倒序排列的正确性
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 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..bab9b03 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -1,16 +1,17 @@
package cc.mrbird.febs.mall.quartz;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
-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.exception.FebsException;
+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;
@@ -23,6 +24,7 @@
**/
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "false")
public class OrderOvertimeJob {
@Autowired
@@ -40,34 +42,48 @@
@Autowired
private MallGoodsSkuMapper mallGoodsSkuMapper;
+ @Autowired
+ private MallMemberCouponMapper mallMemberCouponMapper;
+
@Scheduled(cron = "0 0/5 * * * ? ")
public void overtimeJob() {
log.info("订单超时任务执行");
- List<MallOrderInfo> orderList = orderInfoMapper.selectOrderInfoByStatus(OrderStatusEnum.WAIT_PAY.getValue());
+ List<MallOrderInfo> orderList = orderInfoMapper.selectOrderInfoUpTime(OrderStatusEnum.WAIT_PAY.getValue());
if (CollUtil.isNotEmpty(orderList)) {
for (MallOrderInfo orderInfo : orderList) {
- long subTime = DateUtil.between(orderInfo.getOrderTime(), new Date(), DateUnit.MINUTE, false);
+ //更新订单状态
+ orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
+ orderInfoMapper.updateById(orderInfo);
- if (subTime > 15) {
- 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 sku = mallGoodsSkuMapper.selectSkuInfoById(mallOrderItem.getSkuId());
+ if (sku == null) {
+ throw new FebsException("购买商品或sku不存在");
+ }
- MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(skuId);
- mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - cnt);
- mallGoodsSku.setStock(mallGoodsSku.getStock() + cnt);
- mallGoodsSkuMapper.updateById(mallGoodsSku);
+// 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);
+ }
}
}
}
@@ -75,10 +91,13 @@
}
-// @Scheduled(cron = "0/5 * * * * ? ")
-// public void wakeup() {
-// log.info("本地保持唤醒状态");
-// Long id = 5L;
-// mallMemberMapper.selectById(id);
-// }
+
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void wakeup() {
+ redisUtils.set("wakeup", "wakeup");
+ }
}
--
Gitblit v1.9.1