From 99f029d503de14f37efe15a79df391539399b364 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 28 Sep 2024 15:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rabbit/print/YxyPrinter.java              | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
index ac9e804..cdc1a69 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.chaozhanggui.system.cashierservice.bean.OrderUseTypeEnum;
 import com.chaozhanggui.system.cashierservice.dao.TbProductMapper;
 import com.chaozhanggui.system.cashierservice.dao.TbProductSkuMapper;
 import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper;
@@ -40,11 +41,24 @@ public class YxyPrinter extends PrinterHandler{
         this.tbCallTableMapper = tbCallTableMapper;
     }
 
+    private String getPickupNum(TbOrderInfo orderInfo) {
+        String pickupNum = "";
+        if ("miniapp".equals(orderInfo.getOrderType())) {
+            if (OrderUseTypeEnum.TAKEOUT.getValue().equals(orderInfo.getUseType())) {
+                pickupNum = orderInfo.getOutNumber();
+            }else {
+                pickupNum = orderInfo.getTableName();
+            }
+        }else {
+            pickupNum = orderInfo.getMasterId();
+        }
+        return pickupNum;
+    }
 
     @Override
     protected void returnDishesPrint(TbOrderInfo orderInfo, TbOrderDetail orderDetail, TbPrintMachine machine) {
-        String data = PrinterUtils.getPrintData("return",
-                orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
+
+        String data = PrinterUtils.getPrintData("return", getPickupNum(orderInfo),
                 DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(),
                 Math.abs(orderDetail.getNum()), orderDetail.getRemark(), orderDetail.getNote());
 //        String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}";
@@ -54,7 +68,7 @@ public class YxyPrinter extends PrinterHandler{
 
     @Override
     protected void normalDishesPrint(TbOrderInfo orderInfo, TbOrderDetail orderDetail, TbPrintMachine machine) {
-        String data = PrinterUtils.getPrintData("", orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
+        String data = PrinterUtils.getPrintData("", getPickupNum(orderInfo),
                 DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(),
                 orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getNote());
 //        String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
@@ -65,9 +79,7 @@ public class YxyPrinter extends PrinterHandler{
     @Override
     protected void returnOrderPrint(TbOrderInfo orderInfo, TbPrintMachine machine, String balance, List<OrderDetailPO.Detail> detailList) {
         TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
-        OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
-                ObjectUtil.isEmpty(orderInfo.getMasterId()) ||
-                        orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
+        OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", getPickupNum(orderInfo),
                 orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
                 "【POS-1】001", orderInfo.getPayAmount().toPlainString(), balance, orderInfo.getPayType(),
                 "0", detailList, orderInfo.getRemark(), null, null);
@@ -85,7 +97,7 @@ public class YxyPrinter extends PrinterHandler{
         TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
 
         OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
-                orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
+                getPickupNum(orderInfo),
                 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()),