From 111a92935a6b79d5c58d8913db0040d8cce40f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Fri, 13 Dec 2024 17:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E9=A2=84=E8=AE=A2=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/dto/shop/TbShopTableQueryCriteria.java   | 10 ++++++++++
 .../impl/shopimpl/TbShopTableServiceImpl.java        | 12 ++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
index ef4b3645..1e6fcbae 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
@@ -53,6 +53,15 @@ public class TbShopTableQueryCriteria{
     private Integer page = 1;
     private Integer size = 99999;
 
+    /**
+     * 预约日期 yyyy-MM-dd
+     */
+    private String bookingDate;
+    /**
+     * 预约类型 lunch-午餐 dinner-晚餐
+     */
+    private String bookingType;
+
     public Integer getIsPredate() {
         return isPredate;
     }
@@ -60,4 +69,5 @@ public class TbShopTableQueryCriteria{
     public void setIsPredate(Integer isPredate) {
         this.isPredate = isPredate;
     }
+
 }
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 75aa030d..c9ec280b 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
@@ -334,16 +334,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId());
             itemMap.put("useType", orderInfo == null ? null : orderInfo.getUseType());
             itemMap.put("masterId", orderInfo == null ? null : orderInfo.getMasterId());
+            String bookingDate = StrUtil.blankToDefault(criteria.getBookingDate(), DateUtil.today());
+            String bookingType = StrUtil.blankToDefault(criteria.getBookingType(), "lunch");
             LambdaQueryWrapper<TbShopTableBooking> wrapper = Wrappers.lambdaQuery();
-            wrapper.eq(TbShopTableBooking::getBookingDate, DateUtil.today());
+            wrapper.eq(TbShopTableBooking::getBookingDate, bookingDate);
+            wrapper.eq(TbShopTableBooking::getBookingType, bookingType);
             wrapper.eq(TbShopTableBooking::getShopTableId, data.getId());
             wrapper.ne(TbShopTableBooking::getStatus, -1);
             wrapper.eq(TbShopTableBooking::getDelFlag, 0);
             List<TbShopTableBooking> list = tbShopTableBookingService.list(wrapper);
-            if (list == null) {
-                list = new ArrayList<>();
+            TbShopTableBooking bookingInfo = null;
+            if (CollUtil.isNotEmpty(list)) {
+                bookingInfo = list.get(0);
             }
-            itemMap.put("bookingList", list);
+            itemMap.put("bookingInfo", bookingInfo);
             infoList.add(itemMap);
         }
         HashMap<String, Object> map = new HashMap<>();