1.代客下单 打印菜品小票,以及结算小票

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java

@@ -1,6 +1,7 @@
 package com.chaozhanggui.system.cashierservice.rabbit;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.system.cashierservice.dao.*;
 import com.chaozhanggui.system.cashierservice.entity.*;
@@ -216,6 +217,7 @@ public class PrintMechineConsumer {
                                     balance = user.getAmount().toPlainString();
                                 }
                             }
+
                             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());
 //                                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);
@@ -224,6 +226,10 @@ public class PrintMechineConsumer {
 
                                 String data = PrinterUtils.getCashPrintData(detailPO, printType, orderInfo.getOrderType());
                                 String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
+                                if (StrUtil.isNotBlank(orderInfo.getUseType()) && orderInfo.getUseType().equals("postPay")
+                                        && (!orderInfo.getStatus().equals("closed"))) {
+                                    return;
+                                }
                                 PrinterUtils.printTickets(voiceJson, 3, Integer.valueOf(printerNum), tbPrintMachineWithBLOBs.getAddress(), data);
                             }
                         }
@@ -251,6 +257,10 @@ public class PrintMechineConsumer {
                                         }
                                         String data = PrinterUtils.getPrintData("return",orderInfo.getPayType().equals("wx_lite")?orderInfo.getTableName():orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), it.getNum(), remark);
                                         String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}";
+                                        if (StrUtil.isNotBlank(orderInfo.getUseType()) && orderInfo.getUseType().equals("postPay")
+                                        && (!orderInfo.getStatus().equals("unpaid"))) {
+                                            return;
+                                        }
                                         PrinterUtils.printTickets(voiceJson,3, Integer.valueOf(printerNum), tbPrintMachineWithBLOBs.getAddress(), data);
                                     }
                                 });

src/main/resources/mapper/TbShopTableMapper.xml

@@ -241,7 +241,7 @@
     <if test="status != null and status !=''">
       and a.status = #{status}
     </if>
-    GROUP BY a.qrcode
+    GROUP BY a.id
     order by a.`sort` asc
   </select>
 </mapper>