From b3810c8cb1fb0b9b33cd42fcabd0cf30bacab37d Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Wed, 14 May 2025 15:02:50 +0800 Subject: [PATCH] feat(mall): 添加商品积分价格字段 --- src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 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 2ff512f..e408b37 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,15 @@ 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.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,6 +23,7 @@ **/ @Slf4j @Component +@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true") public class OrderOvertimeJob { @Autowired @@ -40,6 +40,9 @@ @Autowired private MallGoodsSkuMapper mallGoodsSkuMapper; + + @Autowired + private MallMemberCouponMapper mallMemberCouponMapper; @Scheduled(cron = "0 0/5 * * * ? ") public void overtimeJob() { @@ -60,9 +63,9 @@ throw new FebsException("购买商品或sku不存在"); } - if (sku.getStock() < mallOrderItem.getCnt()) { - throw new FebsException(sku.getSkuName() + "库存不足"); - } +// if (sku.getStock() < mallOrderItem.getCnt()) { +// throw new FebsException(sku.getSkuName() + "库存不足"); +// } MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId()); Integer goodsResult = mallGoodsMapper.updateStockAndVolumeByGoodsId(mallGoods.getId(), mallOrderItem.getCnt()); @@ -74,6 +77,12 @@ 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); + } } } } -- Gitblit v1.9.1