From 15a2292de8eb9560a8fe296b8bc2beba660057b3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 19 Dec 2019 15:10:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BA=93=E5=AD=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=A4=B1=E8=B4=A5=E5=BA=93=E5=AD=98=E9=80=80?= =?UTF-8?q?=E5=9B=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/OrderExpiringSchedule.java | 13 +++++++------ .../src/main/resources/mapper/WxCouponMapper.xml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) 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