From 72e23fbdbe23a3cf81b422c4fb9b37bf52ac04b4 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 14 Aug 2025 11:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AE=A2=E9=A4=90=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/controller/CanteenOnlineSpuController.java   | 2 +-
 .../service/impl/CanteenOnlineSpuServiceImpl.java        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java
index 8019f5f1c..dcee541b7 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java
@@ -156,7 +156,7 @@ public class CanteenOnlineSpuController {
     @Operation(summary = "获取在线点餐的菜品列表", description = "1.通过分类id,可以不填，默认查全部,2.商户id，必传")
     public R<List<APPOnlineSpuVO>> getCanteenSpuList(@RequestParam(value = "categoryId", required = false) String categoryId,
                                                      @RequestParam(value = "merchantId") String merchantId,
-                                                     @RequestParam(value = "time")String time) {
+                                                     @RequestParam(value = "time",required = false)String time) {
         return canteenOnlineSpuService.getCanteenOnlineSpuList(categoryId, merchantId,time);
     }
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java
index 1c140f045..8df22d705 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java
@@ -25,6 +25,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -58,7 +60,12 @@ public class CanteenOnlineSpuServiceImpl extends ServiceImpl<CanteenOnlineSpuMap
         //根据商户查询当前日期的每日菜谱，查询每日菜谱上架的菜的id，然后在从在线订餐的列表筛选出今天有上新的数据
         LambdaQueryWrapper<CanteenDailyMenuEntity> dailyMenuEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
         dailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getMerchantId, merchantId);
-        dailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getStartTime,time);
+        if (!StringUtils.isEmpty(time)){
+            dailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getStartTime,time);
+        }else {
+            time = LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE); // 格式化为 yyyy-MM-dd
+            dailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getStartTime,time);
+        }
         List<CanteenDailyMenuEntity> dailyMenuEntities = canteenDailyMenuMapper.selectList(dailyMenuEntityLambdaQueryWrapper);
         List<Long> linkSpuIds = dailyMenuEntities.stream().map(d -> d.getSpuId()).collect(Collectors.toList());
         //从canteenSpuEntities中筛选出今天有上新的数据