From 580fe843a333628795d619c5744a8353c44eb8ed Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 13 Feb 2025 11:31:53 +0800
Subject: [PATCH] feat(mall): 实现充值金额处理和唯一标识生成
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 96 +++++++++++++++++++++++------------------------
1 files changed, 47 insertions(+), 49 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 2094dea..d9197bc 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -1,22 +1,10 @@
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.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.scheduling.annotation.Scheduled;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
/**
* @author wzy
@@ -24,6 +12,7 @@
**/
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
public class OrderOvertimeJob {
@Autowired
@@ -41,45 +30,54 @@
@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);
+ @Autowired
+ private MallMemberCouponMapper mallMemberCouponMapper;
- 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()) {
+// @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() + "库存不足");
// }
-
- 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);
+// }
+// }
+// }
+// }
+// }
+//
+// }
// @Scheduled(cron = "0/5 * * * * ? ")
// public void wakeup() {
--
Gitblit v1.9.1