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()+"


");