From b6eb72f26083149b07ad68f740dc00c2480fa786 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 3 Apr 2026 17:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=80=BB=E8=AE=A1=20=20?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E9=97=B4=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/order/vo/OrderInfoVo.java         | 4 ++--
 .../java/com/czg/service/order/print/PrinterHandler.java    | 2 +-
 .../main/java/com/czg/service/order/print/PrinterImpl.java  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java
index bef7504cb..0a8046bd8 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java
@@ -84,7 +84,7 @@ public class OrderInfoVo implements Serializable {
      */
     private String orderType;
     /**
-     * 退款方式 现金退款-cash 原路退回-payBack
+     * 退款方式 线下退款-cash 原路退回-payBack
      */
     private String refundType;
 
@@ -104,7 +104,7 @@ public class OrderInfoVo implements Serializable {
      * 被扫 back-scan
      * 微信小程序 wechat-mini
      * 支付宝小程序 alipay-mini
-     * 会员支付 vip-pay
+     * 余额支付 vip-pay
      * 现金支付 cash-pay
      */
     private String payType;
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
index e6de3ee8a..82de77421 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
@@ -667,7 +667,7 @@ public abstract class PrinterHandler {
         printInfoDTO.setPickupNum(getTableAreaAndName(orderInfo.getShopId(), orderInfo.getTableCode(), orderInfo.getTableName()));
         printInfoDTO.setRefundAmount(refundAmount);
         printInfoDTO.setRefundReason(refundReason);
-        printInfoDTO.setRefundType("cash".equals(refundType) ? "现金退款" : "原路退回");
+        printInfoDTO.setRefundType("cash".equals(refundType) ? "线下退款" : "原路退回");
         return printInfoDTO;
     }
 
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
index 3c69e7c38..fcbf281c0 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
@@ -438,7 +438,7 @@ public interface PrinterImpl {
                     .append(signLabelInfo.br);
         }
         if ("退款单".equals(printInfoDTO.getPrintTitle())) {
-            data.append(getFormatLabel(leftRightAlign("退款总计:", printInfoDTO.getRefundAmount(), 16), signLabelInfo.f)).append(signLabelInfo.br);
+            data.append(getFormatLabel(leftRightAlign("退款总计", printInfoDTO.getRefundAmount(), 16), signLabelInfo.f)).append(signLabelInfo.br);
             data.append(getFormatLabel(StrUtil.format("退款方式:{}", printInfoDTO.getRefundType()), signLabelInfo.s))
                     .append(signLabelInfo.br);
             data.append(getFormatLabel(StrUtil.format("退款原因：{}", printInfoDTO.getRefundReason()), signLabelInfo.s))
@@ -449,8 +449,8 @@ public interface PrinterImpl {
         }
         data.append(getFormatLabel("--------------------------------", signLabelInfo.s))
                 .append(signLabelInfo.br);
-        data.append(getFormatLabel(StrUtil.format("操作员：{}", printInfoDTO.getOperator()), signLabelInfo.s));
-        data.append(getFormatLabel(StrUtil.format("打印时间：{}", DateUtil.date().toString()), signLabelInfo.s));
+        data.append(getFormatLabel(StrUtil.format("操作员：{}", printInfoDTO.getOperator()), signLabelInfo.s)).append(signLabelInfo.br);
+        data.append(getFormatLabel(StrUtil.format("打印时间：{}", DateUtil.date().toString()), signLabelInfo.s)).append(signLabelInfo.br);
         data.append(getFormatLabel(StrUtil.format("订单号：{}", printInfoDTO.getOrderNo()), signLabelInfo.s)).append(signLabelInfo.br);
         data.append(signLabelInfo.getOut(180));
         data.append(signLabelInfo.cut);