From 3c656d8a4dc91e31abc6d1e474d337e7a96ed7ba Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 5 Mar 2025 19:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=86=99=E7=9C=9F?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=89=B9=E6=AE=8A=E4=BA=A7=E5=93=81=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/OrderStatusListener.java | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/cultural/heritage/listener/OrderStatusListener.java b/src/main/java/com/cultural/heritage/listener/OrderStatusListener.java index 1564c59..01e356a 100644 --- a/src/main/java/com/cultural/heritage/listener/OrderStatusListener.java +++ b/src/main/java/com/cultural/heritage/listener/OrderStatusListener.java @@ -1,8 +1,14 @@ package com.cultural.heritage.listener; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cultural.heritage.common.ErrorCode; import com.cultural.heritage.constant.MqConstant; import com.cultural.heritage.constant.OrderStatusConstant; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.model.dto.snapshot.CouponSnapshot; import com.cultural.heritage.model.entity.Order; +import com.cultural.heritage.model.entity.PendingServiceOrder; +import com.cultural.heritage.model.entity.UserCoupon; import com.cultural.heritage.service.common.CommonService; import com.cultural.heritage.service.good.UserCouponService; import com.cultural.heritage.service.order.OrderService; @@ -69,32 +75,32 @@ public class OrderStatusListener { }); return ; } -// // 没有剩余延时时间，说明订单超时未支付，需取消订单 -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// updateWrapper.eq("id", orderId).set("orderStatus", OrderStatusConstant.TRANSACTION_CLOSED); -// boolean update = orderService.update(updateWrapper); -// ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "订单状态更新失败"); -// -// // 如果使用了优惠券，则退还优惠券 -// CouponSnapshot couponSnapshot = order.getCouponSnapshot(); -// if (couponSnapshot != null) { -// Long userCouponId = couponSnapshot.getId(); -// UserCoupon userCoupon = userCouponService.getById(userCouponId); -// ThrowUtils.throwIf(userCoupon == null, ErrorCode.OPERATION_ERROR, "优惠券不存在"); -// // 更新优惠券状态 -// userCoupon.setIsUsed(0); -// boolean result = userCouponService.updateById(userCoupon); -// ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "优惠券状态更新失败"); -// } -// -// boolean isGeneral = orderService.isGeneralGood(order.getOrderType()); -// if (!isGeneral) { -// System.out.println("=========================================>" + order.getOrderNumber()); -// UpdateWrapper pendingServiceOrderUpdateWrapper = new UpdateWrapper<>(); -// pendingServiceOrderUpdateWrapper.eq("orderNumber", order.getOrderNumber()).set("orderItemStatus", OrderStatusConstant.TRANSACTION_CLOSED); -// boolean updateBatch = pendingServiceOrderService.update(pendingServiceOrderUpdateWrapper); -// ThrowUtils.throwIf(!updateBatch, ErrorCode.OPERATION_ERROR, "订单状态批量更新失败"); -// } + // 没有剩余延时时间，说明订单超时未支付，需取消订单 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", orderId).set("orderStatus", OrderStatusConstant.TRANSACTION_CLOSED); + boolean update = orderService.update(updateWrapper); + ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "订单状态更新失败"); + + // 如果使用了优惠券，则退还优惠券 + CouponSnapshot couponSnapshot = order.getCouponSnapshot(); + if (couponSnapshot != null) { + Long userCouponId = couponSnapshot.getId(); + UserCoupon userCoupon = userCouponService.getById(userCouponId); + ThrowUtils.throwIf(userCoupon == null, ErrorCode.OPERATION_ERROR, "优惠券不存在"); + // 更新优惠券状态 + userCoupon.setIsUsed(0); + boolean result = userCouponService.updateById(userCoupon); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "优惠券状态更新失败"); + } + + boolean isGeneral = orderService.isGeneralGood(order.getOrderType()); + if (!isGeneral) { + System.out.println("=========================================>" + order.getOrderNumber()); + UpdateWrapper pendingServiceOrderUpdateWrapper = new UpdateWrapper<>(); + pendingServiceOrderUpdateWrapper.eq("orderNumber", order.getOrderNumber()).set("orderItemStatus", OrderStatusConstant.TRANSACTION_CLOSED); + boolean updateBatch = pendingServiceOrderService.update(pendingServiceOrderUpdateWrapper); + ThrowUtils.throwIf(!updateBatch, ErrorCode.OPERATION_ERROR, "订单状态批量更新失败"); + } }