From 904357aea9fb826209fd1bb4dee291495cfbea77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 17:44:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E6=A1=8C=E5=B9=B6=E6=A1=8C?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 efaa2350..dfea39ed 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
@@ -2693,6 +2693,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 tbCashierCart.setNumber(BigDecimal.valueOf(choseCountDTO.getNum()));
                 tbCashierCart.setTotalNumber(BigDecimal.valueOf(choseCountDTO.getNum()));
                 tbCashierCart.setUseType(choseCountDTO.getUseType());
+                tbCashierCart.setPlatformType("pc");
                 tbCashierCartMapper.insert(tbCashierCart);
             } else {
                 tbCashierCart.setMemberPrice(shopInfo.getTableFee());
@@ -3429,9 +3430,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         mpOrderDetailService.removeByCartIds(cartIds);
 
         // 删除原有台桌detail和order信息
-        if (switchTableDTO.isFull() || switchTableDTO.getCartIds().size() == totalSize) {
+        if (orderId != null && (switchTableDTO.isFull() || switchTableDTO.getCartIds().size() == totalSize)) {
             mpOrderInfoService.removeById(orderId);
-        }else {
+        }
+
+        if (!switchTableDTO.isFull() && switchTableDTO.getCartIds().size() != totalSize){
             // 重新创建订单数据
             CreateOrderDTO createOrderDTO = new CreateOrderDTO();
             createOrderDTO.setMasterId(switchTableDTO.getMasterId());