From 06fa5b4f0d57cc1d5a4aaf460d0640c432db1040 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Apr 2026 10:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=8F=9C=E9=80=80=E6=AC=BE=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/order/dto/OrderInfoRefundDTO.java | 4 ++++ .../service/order/service/impl/OrderPayServiceImpl.java | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java index 4933103ef..903799856 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java @@ -50,6 +50,10 @@ public class OrderInfoRefundDTO implements Serializable { * 是否是现金退款 */ private boolean cash; + /** + * 是否打印退菜/退款票 + */ + private boolean print; private String refundReason; 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 5b6e55245..d7f2c27a0 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 @@ -510,9 +510,11 @@ public class OrderPayServiceImpl implements OrderPayService { orderInfo.setRefundRemark(orderInfo.getRefundRemark() + param.getRefundReason()); orderInfoService.updateById(orderInfo); //退款后续 退款单/退菜单 - printerHandler.refundOrderHandler(printTitle, StrUtil.isNotBlank(param.getOperator()) ? param.getOperator() : "" - , isPay ? param.getRefundAmount().toPlainString() : "0" - , param.getRefundReason(), orderInfo.getRefundType(), orderInfo, param.getRefundDetails()); + if (param.isPrint()) { + printerHandler.refundOrderHandler(printTitle, StrUtil.isNotBlank(param.getOperator()) ? param.getOperator() : "" + , isPay ? param.getRefundAmount().toPlainString() : "0" + , param.getRefundReason(), orderInfo.getRefundType(), orderInfo, param.getRefundDetails()); + } //退款返还库存 if (!returnProMap.isEmpty()) { rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(Map.of("orderId", orderInfo.getId(), "returnProMap", returnProMap)));