From 95965f8a3c111b7e264b086385b667fd3f65fdc7 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 29 Aug 2024 09:46:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=93=E5=8D=B0=E6=8A=98=E6=89=A3=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/rabbit/PrintMechineConsumer.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
index 490ac89..6c1cefb 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -224,7 +224,13 @@ public class PrintMechineConsumer {
 
                             if (ObjectUtil.isNotEmpty(detailList) && detailList.size() > 0) {
 
-                                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()), "0", detailList, orderInfo.getRemark(),orderInfo.getDiscountAmount().toPlainString(),orderInfo.getDiscountRatio().toPlainString());
+                                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
+                                            orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
+                                            orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
+                                            "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,
+                                            (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
+                                            "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() != null ? orderInfo.getDiscountAmount().toPlainString() : null,
+                                            orderInfo.getDiscountRatio() != null ? orderInfo.getDiscountRatio().toPlainString() : null);
 //                                OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList);
                                     detailPO.setOutNumber(orderInfo.getOutNumber());
                                     String printType = "结算单";