From f4a850a4cbd91b1cd894b92693c6d13aacb02e62 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Sat, 28 Mar 2026 13:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E9=87=91=E9=A2=9D5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/service/order/print/FeiPrinter.java   | 2 +-
 .../src/main/java/com/czg/service/order/print/YxyPrinter.java   | 2 +-
 2 files changed, 2 insertions(+), 2 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 e571ee984..2de9bddb1 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
@@ -105,7 +105,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
 
         if (orderInfo.getPayAmount() != null && orderInfo.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
             // 设置支付金额为 订单原价-订单优惠金额
-            printInfoDTO.setPayAmount(orderInfo.getOriginAmount().subtract(orderInfo.getDiscountAllAmount()).toPlainString());
+            printInfoDTO.setPayAmount((new BigDecimal(printInfoDTO.getOriginalAmount()).subtract(new BigDecimal(printInfoDTO.getDiscountAmount()))).toPlainString());
         }
         String string = buildOrderPrintData(printInfoDTO, detailList);
         String o = sendPrintRequest(machine.getAddress(), string, null, printerNum);
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 5b4263d3b..d36c8a268 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
@@ -172,7 +172,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
                     : "0.00");
         if (isPre) {
             // 设置支付金额为 订单原价-订单优惠金额
-            printInfoDTO.setPayAmount(orderInfo.getOriginAmount().subtract(orderInfo.getDiscountAllAmount()).toPlainString());
+            printInfoDTO.setPayAmount((new BigDecimal(printInfoDTO.getOriginalAmount()).subtract(new BigDecimal(printInfoDTO.getDiscountAmount()))).toPlainString());
         }
         printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle());
         if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) {