diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 488dfe1f8..77a917791 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -925,10 +925,10 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("已退款: couponOrder-" + wxCouponOrder.getCouponId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_OVER_TIME); } - if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { - logger.error("已经核销过的券: couponOrder-" + wxCouponOrder.getCouponId()); - throw new MallinkException(ErrorCode.COUPON_ORDER_IS_USED); - } +// if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { +// logger.error("已经核销过的券: couponOrder-" + wxCouponOrder.getCouponId()); +// throw new MallinkException(ErrorCode.COUPON_ORDER_IS_USED); +// } } EnumRefundSource refundSource = EnumRefundSource.getEnum(refundOrderCallback.getRefundSource()); @@ -953,6 +953,10 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } for (WxCouponOrder wxCouponOrder:couponOrderList) { + if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { + logger.error("已经核销过的券: couponOrder-" + wxCouponOrder.getCouponId()); + continue; + } // 更改 couponOrder 状态 if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_RETURNED.getCode()); // 卡线下退款