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 29f2eb4..db67347 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -673,7 +673,7 @@ public class PrintMechineConsumer {
                     }
 
 
-                    FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
+                    FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
                 }
             });
         }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java
index 8949c77..cc26ce6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java
@@ -69,7 +69,7 @@ public class FeiPrinter extends PrinterHandler {
             return;
         }
         String remark = sku.getSpecSnap();
-        String[] resp = FeieyunPrintUtil.getPrintData(machine.getAddress(), orderInfo.getMasterId(),
+        String[] resp = FeieyunPrintUtil.getPrintData(machine.getAddress(), orderInfo,
                 DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), remark);
         shopPrintLogService.save(machine, "新订单", resp[0], resp[1]);
     }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
index d3b8c29..1bc6bab 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
@@ -262,7 +262,7 @@ public class CloudPrinterService {
                     if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) {
                         remark = tbProductSkuWithBLOBs.getSpecSnap();
                     }
-                    OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark);
+                    OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(), it.getPrice()).toPlainString(), remark);
                     detailList.add(detail);
 
                 });
@@ -397,7 +397,7 @@ public class CloudPrinterService {
                     if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) {
                         remark = tbProductSkuWithBLOBs.getSpecSnap();
                     }
-                    OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark);
+                    OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(), it.getPrice()).toPlainString(), remark);
                     detailList.add(detail);
 
                 });
@@ -527,7 +527,7 @@ public class CloudPrinterService {
                         remark = tbProductSkuWithBLOBs.getSpecSnap();
                     }
 
-                    FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
+                    FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
                 }
             });
         }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
index 68589fb..0b39e06 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
@@ -8,6 +8,8 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.chaozhanggui.system.cashierservice.bean.OrderUseTypeEnum;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo;
 import com.chaozhanggui.system.cashierservice.entity.po.CallNumPrintPO;
 import com.chaozhanggui.system.cashierservice.model.OrderDetailPO;
 import lombok.extern.slf4j.Slf4j;
@@ -120,7 +122,6 @@ public class FeieyunPrintUtil {
 
     public static String buildPrintContent(String pickupNumber, String date, String productName, Integer number, String remark) {
         StringBuilder builder = new StringBuilder();
-        log.error("打印数据pickupNumber>>>>>>>>>>>>>>>>>>>>>:{}", pickupNumber);
         builder.append("<CB>" + pickupNumber + "</CB><BR><BR>");
         builder.append("<L>时间: " + date + " </L><BR><BR><BR>");
         remark = StrUtil.emptyToDefault(remark, "");
@@ -135,8 +136,8 @@ public class FeieyunPrintUtil {
         return builder.toString();
     }
 
-    public static String[] getPrintData(String sn, String pickupNumber, String date, String productName, Integer number, String remark) {
-        String content = buildPrintContent(pickupNumber, date, productName, number, remark);
+    public static String[] getPrintData(String sn, TbOrderInfo orderInfo, String date, String productName, Integer number, String remark) {
+        String content = buildPrintContent(getPickupNum(orderInfo), date, productName, number, remark);
 
         System.out.println("content:".concat(content));
 
@@ -200,6 +201,20 @@ public class FeieyunPrintUtil {
 
     }
 
+    private static 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;
+    }
+
     public static String buildPrintContent(OrderDetailPO detailPO, String type, String orderType) {
         StringBuffer data = new StringBuffer();
         data.append(StrUtil.format("<CB>{}</CB><BR>", detailPO.getMerchantName()));