From 71f0c0cd9cf17d4f07919e9e24eb5dcb6a1f42fc Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 16 Jan 2023 21:18:50 +0800 Subject: [PATCH] fix bug --- .../main/java/com/iformall/service/impl/WxOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 4c96b56fd..70cce4adf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2314,7 +2314,7 @@ public class WxOrderServiceImpl implements WxOrderService { public int updateOrderStatus(WxOrder updateOrder, EnumOrderStatus enumOrderStatus) { Date currentDate = new Date(); WxOrder oldOrder = wxOrderMapper.selectById(updateOrder.getId(),updateOrder.getTenantId()); - if (!oldOrder.getOrderStatus().equals(enumOrderStatus.getCode())) { + if ((!oldOrder.getOrderStatus().equals(enumOrderStatus.getCode())) && (!oldOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_OVERTIME_PAID_REFUND.getCode()))) { // 状态已更新,库存不退回, 保证不会多退 switch (enumOrderStatus) { case ORDER_STATUS_OVERTIME_CANCEL: // 支付取消,库存退回