From c3ca4b96db3e6a8afe640d1eae06c69d10481eac Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Sat, 16 Aug 2025 12:54:13 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E8=A7=A3=E5=86=B3=E5=91=A8=E6=9C=AB?=
 =?UTF-8?q?=E9=A2=84=E5=AE=9A=E9=A4=90=20=E6=97=A0=E6=B3=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=97=A5=E6=9C=9F=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=E4=BD=86=E5=91=A8=E4=B8=80=E8=87=B3=E5=91=A8=E4=BA=94=E5=8D=B4?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=9B=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E8=AF=A6=E6=9F=A5=EF=BC=9B=E7=9B=AE=E5=89=8D=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9C=89=E6=97=A0=E7=A9=BA=E5=80=BC=EF=BC=8C=E6=9C=89=E7=A9=BA?=
 =?UTF-8?q?=E5=80=BC=E5=B0=B1=E8=AE=BE=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AllocStallServiceImpl.java       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java
index fde8d44e..779ad6ef 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java
@@ -62,8 +62,19 @@ public class AllocStallServiceImpl extends ServiceImpl<AllocStallMapper, AllocSt
    @Override
    public List<LocalDate> listReserveDate(AllocMobileCanteenQueryDTO queryDTO) {
       AllocCanteenOrderDTO allocCanteenOrderDTO = this.allocOrderMetadataApi.queryAvailableOrder(queryDTO.getCanteenId(), queryDTO.getStallId());
-      String ifReserveSkipHoliday = allocCanteenOrderDTO.getIfReserveSkipHoliday();
-      Integer reserveLimitDayNum = Integer.parseInt(allocCanteenOrderDTO.getReserveLimitDay());
+      String ifReserveSkipHoliday="1";
+      if(allocCanteenOrderDTO.getIfReserveSkipHoliday()!=null&&!"".equals(allocCanteenOrderDTO.getIfReserveSkipHoliday())){
+         ifReserveSkipHoliday= allocCanteenOrderDTO.getIfReserveSkipHoliday();
+      }
+      Integer reserveLimitDayNum = 0;
+      try{
+         reserveLimitDayNum=Integer.parseInt(allocCanteenOrderDTO.getReserveLimitDay());
+      }catch (Exception e){
+         reserveLimitDayNum=7;
+      }
+      if(allocCanteenOrderDTO.getIfAllowReserveToday()==null||"".equals(allocCanteenOrderDTO.getIfAllowReserveToday())){
+         allocCanteenOrderDTO.setIfAllowReserveToday("1");
+      }
       return this.listMatchData(ifReserveSkipHoliday, reserveLimitDayNum, allocCanteenOrderDTO.getIfAllowReserveToday());
    }