From 27ab2ab3e93a0bf23a41713adb6417801a1dcf85 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 13 Oct 2021 15:19:48 +0800 Subject: [PATCH] update gift --- .../com/iformall/schedule/CouponOrderExpiringSchedule.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 805707ca3..82ee5aff7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -112,6 +112,10 @@ public class CouponOrderExpiringSchedule { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void couponOrderExpire(WxCouponOrder co, boolean bStockBack) { + //商品订单不过期 + if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(co.getCouponType())){ + return; + } // 标记 couponOrder过期 WxCouponOrder updateRecord = new WxCouponOrder(); updateRecord.setId(co.getId()); @@ -127,7 +131,8 @@ public class CouponOrderExpiringSchedule { // 库存退回 if(bStockBack) { WxOrder order = wxOrderMapper.selectById(co.getOrderId(),co.getTenantId()); - if(order != null) { + //券包子券没有库存 + if(order != null && order.getParentOrderId() == 0l) { wxOrderService.stockBack(order); } }