From e7c6561db45c55ad71dbf7a5b06bb4b107d96a10 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 22 Apr 2026 13:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=8F=9C=20=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/service/impl/OrderInfoCustomServiceImpl.java | 2 +- .../com/czg/service/order/service/impl/OrderPayServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 0678fbef0..27e0db09d 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -1865,7 +1865,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } } else if (shopInfo.getRefundMode().equals(2)) { //单商品 - refundMode = 2; + refundMode = product.getRefundMode(); } else { log.error("退菜模式错误 店铺{},退款模式{},商品Id{}分类Id{}", shopInfo.getShopName(), shopInfo.getRefundMode(), product.getId(), product.getCategoryId()); throw new CzgException("退菜模式错误"); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java index 665bcc273..da3060f6b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java @@ -525,7 +525,7 @@ public class OrderPayServiceImpl implements OrderPayService { FunUtils.safeRunVoid(() -> printConfig.kitchenRefundAllHandler(StrUtil.isNotBlank(param.getOperator()) ? param.getOperator() : "", orderInfo, param.getRefundDetails()), "订单id:{} 退款,后厨退菜单打印消息失败", orderInfo.getId()); //退款返还库存 - if (!productStockMap.isEmpty()) { + if (CollUtil.isNotEmpty(productStockMap)) { FunUtils.safeRunVoid(() -> orderInfoCustomService.refundStock(shopInfo, orderInfo.getId(), productStockMap, param.isRefundStock()), "订单id:{} 退款,库存处理失败", orderInfo.getId()); }