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

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 8f362ea3..dce4c40f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1089,6 +1089,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             // 当前下单次数
             int placeNum = getCurrentPlaceNum(shopEatTypeInfoDTO);
             List<TbOrderDetail> orderDetails = new ArrayList<>();
+            List<TbOrderDetail> addOrderDetails = new ArrayList<>();
+
 
             BigDecimal mealAmount = null;
             Integer mealNum = null;
@@ -1113,6 +1115,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 if (orderDetail == null) {
                     orderDetail = new TbOrderDetail();
                     hasNewInfo = true;
+                    addOrderDetails.add(orderDetail);
                 }
 
                 if (Objects.nonNull(productSku)) {
@@ -1229,10 +1232,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             // 删除已经移除购物车的订单 修改并保存数据
             if (!orderDetails.isEmpty()) {
                 mpOrderDetailService.saveOrUpdateBatch(orderDetails);
-                if (shopEatTypeInfoDTO.isDineInAfter()) {
-                    rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, orderDetails.toArray(new TbOrderDetail[0]));
-                }
             }
+
+            if (!addOrderDetails.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
+                rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetails.toArray(new TbOrderDetail[0]));
+            }
+
             if (!removeOrderDetailIds.isEmpty()) {
                 // 退单票
                 orderDetailMapper.deleteBatchIds(removeOrderDetailIds);