From f0405e6b71ab31e6df10f0f249f0ef5bf59dd462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 20 Mar 2025 15:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/service/order/print/PrinterImpl.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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 97f4d5dfc..71ae5d155 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
@@ -303,7 +303,7 @@ public interface PrinterImpl {
             data.append(getFormatLabel(StrUtil.format("原价：{}", toPlainStr(printInfoDTO.getOriginalAmount())), signLabelInfo.s))
                     .append(signLabelInfo.br);
 //            data.append(StrUtil.format("<S>原价：{}</S><BR>", toPlainStr(printInfoDTO.getOriginalAmount())));
-            data.append(getFormatLabel(StrUtil.format("折扣：-{}", toPlainStr(printInfoDTO.getDiscountAmount())), signLabelInfo.s))
+            data.append(getFormatLabel(StrUtil.format("优惠：-{}", toPlainStr(printInfoDTO.getDiscountAmount())), signLabelInfo.s))
                     .append(signLabelInfo.br);
 //            data.append(StrUtil.format("<S>折扣：-{}</S><BR>", toPlainStr(printInfoDTO.getDiscountAmount())));
         }
@@ -330,12 +330,13 @@ public interface PrinterImpl {
             data.append(getFormatLabel(StrUtil.format("积分：{}", printInfoDTO.getIntegral()), signLabelInfo.s))
                     .append(signLabelInfo.br);
 //            data.append(StrUtil.format("<S>积分：{}</S><BR>", printInfoDTO.getIntegral()));
-        }
-        data.append(getFormatLabel(StrUtil.format("余额：{}", toPlainStr(printInfoDTO.getBalance())), signLabelInfo.s))
-                .append(signLabelInfo.br);
+            data.append(getFormatLabel(StrUtil.format("余额：{}", toPlainStr(printInfoDTO.getBalance())), signLabelInfo.s))
+                    .append(signLabelInfo.br);
 //        data.append(StrUtil.format("<S>余额：{}</S><BR>", toPlainStr(printInfoDTO.getBalance())));
-        data.append(getFormatLabel("--------------------------------", signLabelInfo.s))
-                .append(signLabelInfo.br);
+            data.append(getFormatLabel("--------------------------------", signLabelInfo.s))
+                    .append(signLabelInfo.br);
+        }
+
 //        data.append("<S>--------------------------------</S><BR>");
         if (StrUtil.isNotBlank(printInfoDTO.getRemark())) {
             data.append(getFormatLabel(StrUtil.format("备注：{}", printInfoDTO.getRemark()), signLabelInfo.l, signLabelInfo.bold))