From 2410e965defd634eb9b65ff99f1e9dacbc048284 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 21 Apr 2026 10:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=8D=95=20=E4=B8=8D?=
 =?UTF-8?q?=E6=92=AD=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/service/order/print/FeiPrinter.java  | 2 +-
 .../main/java/com/czg/service/order/print/PrintConfig.java | 7 +++++--
 .../main/java/com/czg/service/order/print/YxyPrinter.java  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
index a15567b31..788a93bf1 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
@@ -213,7 +213,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
         String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";
         if (1 == machine.getVolumeSwitch()) {
             voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
-            if ("退菜单".equals(bizType) || "退款单".equals(bizType)) {
+            if ("退菜单".equals(bizType)) {
                 voiceJson = "{\"bizType\":\"2\",\"content\":\"有客人退菜了，请注意查看\"}";
             }
         }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java
index ea0062940..1fdbd6902 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java
@@ -274,8 +274,11 @@ public class PrintConfig implements ApplicationRunner {
             getPrintMachine(orderInfo.getShopId(), PrinterHandler.PrintTypeEnum.RETURN_ORDER).forEach(machine ->
                     getPrinter(machine.getBrand()).returnOrderPrint(printTitle, operator, refundAmount, refundReason, refundType, orderInfo, machine, detailList));
         } else if ("退款单".equals(printTitle)) {
-            getPrintMachine(orderInfo.getShopId(), PrinterHandler.PrintTypeEnum.REFUND_ORDER).forEach(machine ->
-                    getPrinter(machine.getBrand()).returnOrderPrint(printTitle, operator, refundAmount, refundReason, refundType, orderInfo, machine, detailList));
+            getPrintMachine(orderInfo.getShopId(), PrinterHandler.PrintTypeEnum.REFUND_ORDER).forEach(machine -> {
+                PrinterHandler printer = getPrinter(machine.getBrand());
+                machine.setVolumeSwitch(0);
+                printer.returnOrderPrint(printTitle, operator, refundAmount, refundReason, refundType, orderInfo, machine, detailList);
+            });
         } else {
             log.error("未知的前台退款打印类型: {}", printTitle);
         }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
index c780b26dc..6d21db602 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
@@ -96,7 +96,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
                                           OrderInfo orderInfo, PrintMachine machine, List<OrderDetail> detailList) {
         OrderPrintDTO orderPrintDTO = super.returnOrderPrint(printTitle, operator, refundAmount, refundReason, refundType, orderInfo, machine, detailList);
         String data = buildRefundOrderPrintData(orderPrintDTO, detailList);
-        sendOrderPrint(data, orderInfo.getId(), machine, "退款单");
+        sendOrderPrint(data, orderInfo.getId(), machine, printTitle);
         return null;
     }
 
@@ -208,7 +208,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
         String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";
         if (1 == machine.getVolumeSwitch()) {
             voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
-            if ("退菜单".equals(bizType) || "退款单".equals(bizType)) {
+            if ("退菜单".equals(bizType)) {
                 voiceJson = "{\"bizType\":\"2\",\"content\":\"有客人退菜了，请注意查看\"}";
             }
         }