From 96ecaa840e87d6900806dbf8313aada96ebb13f8 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 25 Oct 2024 16:58:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E4=BC=A0=E9=80=92=E6=A1=8C?=
 =?UTF-8?q?=E7=A0=81=E4=B8=8D=E4=BF=AE=E6=94=B9=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/controller/product/TbPlaceController.java    | 9 +++++++++
 .../java/cn/ysk/cashier/dto/shoptable/ChoseCountDTO.java | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index 803689f2..0103d389 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -1,10 +1,12 @@
 package cn.ysk.cashier.controller.product;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.ysk.cashier.annotation.AnonymousAccess;
 import cn.ysk.cashier.annotation.Log;
 import cn.ysk.cashier.config.security.security.TokenProvider;
 import cn.ysk.cashier.dto.shoptable.*;
+import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.mybatis.mapper.TbMerchantAccountMapper;
 import cn.ysk.cashier.pojo.TbToken;
 import cn.ysk.cashier.pojo.order.TbCashierCart;
@@ -199,6 +201,13 @@ public class TbPlaceController {
     @ApiOperation("代客下单 选择用餐人数")
     public ResponseEntity<Object> choseCount(@Validated @RequestBody ChoseCountDTO choseCountDTO) {
 
+        if (StrUtil.isBlank(choseCountDTO.getTableId())) {
+            return ResponseEntity.ok(null);
+        }
+
+        if (StrUtil.isNotBlank(choseCountDTO.getTableId()) && choseCountDTO.getNum() == null) {
+            throw new BadRequestException("人数不为空");
+        }
         return ResponseEntity.ok(tbShopTableService.choseCount(choseCountDTO));
     }
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ChoseCountDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ChoseCountDTO.java
index ae1ad2f9..14b9416c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ChoseCountDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ChoseCountDTO.java
@@ -12,9 +12,7 @@ public class ChoseCountDTO {
     private String masterId;
     @NotNull
     private Integer shopId;
-    @NotEmpty
     private String tableId;
-    @NotNull
     @Min(1)
     private Integer num;
     @NotEmpty