From 7f986324e028f304cb1fdbcc8209b687d1b8a386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 26 Jun 2024 09:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/cashierservice/rabbit/ConsConsumer.java | 1 -
.../chaozhanggui/system/cashierservice/util/PrinterUtils.java | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsConsumer.java
index 58e4103..83e4649 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsConsumer.java
@@ -29,7 +29,6 @@ import java.util.Objects;
@Component
@RabbitListener(queues = {RabbitConstants.CONS_COLLECT_QUEUE_PUT})
@Service
-
public class ConsConsumer {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
index 0a2d9a5..5797563 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -96,6 +96,10 @@ public class PrinterUtils {
sb.append(""+detailPO.getMerchantName()+"
");
sb.append(""+type+"【"+detailPO.getMasterId()+"】
");
+ if(Objects.nonNull(detailPO.getOutNumber())){
+ sb.append(""+detailPO.getOutNumber()+"
");
+ }
+
sb.append("订单号: "+detailPO.getOrderNo()+"
");
sb.append("交易时间: "+detailPO.getTradeDate()+"
");
sb.append("收银员: "+detailPO.getOperator()+"
");