From 7b62f75cca111372c675bb75d1e53ae6b6bd84ac Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 30 Aug 2024 17:27:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=BF=9D=E5=AD=98=E5=8F=B0?=
 =?UTF-8?q?=E6=A1=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

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 ba014126..3f0d2009 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
@@ -787,6 +787,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             throw new BadRequestException("购物车为空，请先添加商品");
         }
 
+        TbShopTable tbShopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()
+                .eq(TbShopTable::getQrcode, createOrderDTO.getTableId())
+                .in(TbShopTable::getStatus, "idle", "using"));
+
+        if (tbShopTable == null) {
+            throw new BadRequestException("台桌未开台或不存在");
+        }
+
         BigDecimal totalAmount = BigDecimal.ZERO;
         BigDecimal packAMount = BigDecimal.ZERO;
         BigDecimal feeAmount = BigDecimal.ZERO;
@@ -868,6 +876,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderInfo.setRemark(createOrderDTO.getNote());
             orderInfo.setUserId(createOrderDTO.getVipUserId() == null ? null : String.valueOf(createOrderDTO.getVipUserId()));
             orderInfo.setCreatedAt(DateUtil.current());
+            orderInfo.setTableName(tbShopTable.getName());
             TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
                     .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
                     .eq(TbMerchantAccount::getStatus, 1));