From 42d40f0fd34462a3cb5876d8b45b101299d9c70b Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 25 Mar 2025 16:28:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=A3=9F=E5=A0=82=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/vo/app/DailyMenuAppVO.java        |  5 ++++
 .../impl/CanteenDailyMenuServiceImpl.java     | 23 +++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java
index e8ffe0722..acbae8e4c 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java
@@ -40,4 +40,9 @@ public class DailyMenuAppVO {
     private Integer hourType;
 
     private Integer sort;
+
+    /**
+     * 是否显示
+     */
+    private String isShow;
 }
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
index 9d0e67912..4a8a9c4ee 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
+import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
 import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
@@ -48,6 +49,8 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
     private final RemoteMqttEventService remoteMqttEventService;
     private final RemoteMchService remoteMchService;
 
+    private final CanteenSpuMapper canteenSpuMapper;
+
     @Override
     public List<DailyMenuAll> selectTimeFood(String time, Long merchantId, Long categoryId) {
         List<DailyMenuAll> dailyMenuAllES = new ArrayList<>();
@@ -145,16 +148,27 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
         canteenDailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getStartTime, dailyMenuDTO.getStartTime());
         canteenDailyMenuEntityLambdaQueryWrapper.eq(dailyMenuDTO.getHourType() != null,
                 CanteenDailyMenuEntity::getHourType, dailyMenuDTO.getHourType());
+
+        //查询
+        LambdaQueryWrapper<CanteenSpuEntity> onlineFoodSpuDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        onlineFoodSpuDOLambdaQueryWrapper.eq(null != dailyMenuDTO.getCategoryId(), CanteenSpuEntity::getCategoryId, dailyMenuDTO.getCategoryId());
+        onlineFoodSpuDOLambdaQueryWrapper.eq(CanteenSpuEntity::getIsShow, "1");
+        List<CanteenSpuEntity> spuEntities =  canteenSpuService.list(onlineFoodSpuDOLambdaQueryWrapper);
+
+        if (CollectionUtils.isNotEmpty(spuEntities)){
+            List<Long> spuIds = spuEntities.stream().map(CanteenSpuEntity::getId).collect(Collectors.toList());
+            canteenDailyMenuEntityLambdaQueryWrapper.notIn(CanteenDailyMenuEntity::getSpuId, spuIds);
+        }
+
         Page pageData = baseMapper.selectPage(page, canteenDailyMenuEntityLambdaQueryWrapper);
         List<CanteenDailyMenuEntity> canteenDailyMenuEntities = pageData.getRecords();
         if (CollectionUtils.isNotEmpty(canteenDailyMenuEntities)) {
             List<Long> spuIds = canteenDailyMenuEntities.stream().map(CanteenDailyMenuEntity::getSpuId).distinct().collect(Collectors.toList());
-            LambdaQueryWrapper<CanteenSpuEntity> onlineFoodSpuDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            onlineFoodSpuDOLambdaQueryWrapper.eq(null != dailyMenuDTO.getCategoryId(), CanteenSpuEntity::getCategoryId, dailyMenuDTO.getCategoryId());
+            LambdaQueryWrapper<CanteenSpuEntity> spuDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
             onlineFoodSpuDOLambdaQueryWrapper.in(CanteenSpuEntity::getId, spuIds);
-            List<CanteenSpuEntity> canteenSpuEntities = canteenSpuService.list(onlineFoodSpuDOLambdaQueryWrapper);
+            List<CanteenSpuEntity> list = canteenSpuService.list(spuDOLambdaQueryWrapper);
             // 按 id 分组成 Map
-            Map<Long, CanteenSpuEntity> spuEntityMap = canteenSpuEntities.stream()
+            Map<Long, CanteenSpuEntity> spuEntityMap = list.stream()
                     .collect(Collectors.toMap(CanteenSpuEntity::getId, spu -> spu));
             // 构造新的 VO 列表
             List<DailyMenuAppVO> dailyMenuVOList = canteenDailyMenuEntities.stream()
@@ -169,6 +183,7 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
                             vo.setPicUrl(spuEntity.getPicUrl());
                             vo.setName(spuEntity.getName());
                             vo.setSort(spuEntity.getSort());
+                            vo.setIsShow(spuEntity.getIsShow());
                             // 其他需要的字段
                         }
                         return vo;