From 90505fd3543960d223db511b7fbfc1570402cddf Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 12 Oct 2024 10:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=B8=8D=E6=89=93=E5=8D=B0=E8=8F=9C=E5=93=81=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 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 7ee16ace..9423ea37 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
@@ -1038,6 +1038,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
 
     @Override
+    @Transactional
     public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId, boolean isPrint) {
         createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId());
         return Utils.runFunAndCheckKey(() -> {
@@ -1264,18 +1265,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 mpOrderDetailService.saveOrUpdateBatch(orderDetails);
             }
 
-            if (!addOrderDetails.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
-                rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetails.toArray(new TbOrderDetail[0]));
-            }
-
-            if (!removeOrderDetailIds.isEmpty()) {
-                // 退单票
-                orderDetailMapper.deleteBatchIds(removeOrderDetailIds);
-                if (shopEatTypeInfoDTO.isDineInAfter()) {
-                    rabbitMsgUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0]));
-                }
-            }
-
             // 更新购物车记录的orderId
             for (TbCashierCart cashierCart : cashierCarts) {
                 if (!"-999".equals(cashierCart.getProductId())) {
@@ -1302,6 +1291,19 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 cashierCartMapper.updateById(cashierCart);
             }
 
+            // 菜品票
+            if (!addOrderDetails.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
+                rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetails.toArray(new TbOrderDetail[0]));
+            }
+
+            if (!removeOrderDetailIds.isEmpty()) {
+                // 退单票
+                orderDetailMapper.deleteBatchIds(removeOrderDetailIds);
+                if (shopEatTypeInfoDTO.isDineInAfter()) {
+                    rabbitMsgUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0]));
+                }
+            }
+
             if (isFirst) {
                 // 后付费，不增加当前台桌取餐号
                 if (!shopEatTypeInfoDTO.isTakeout()) {