diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index f4ba43803..9400fb5d2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -147,18 +147,19 @@ public class OrderExpiringSchedule { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void orderExpired(WxOrder order) { + // 库存退回 + wxOrderService.stockBack(order); + + // 微信 关单 + wxOrderService.orderClose(order); + + // 订单状态更改 WxOrder updateOrder = new WxOrder(); updateOrder.setId(order.getId()); updateOrder.setUpdateDate(new Date()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); wxOrderMapper.updateById(updateOrder); - // 库存退回 - wxOrderService.stockBack(order); - - // 微信 关单 - wxOrderService.orderClose(updateOrder); - logger.info("券订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + new Date()); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 1c391995e..e7d8afdb3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -530,7 +530,7 @@ - update wx_coupon SET remain_inventory = remain_inventory + #{number} where id = #{id} and remain_inventory + #{number} <= #{inventory} + update wx_coupon SET remain_inventory = remain_inventory + #{number} where id = #{id} and remain_inventory + #{number} <= inventory