From d97820eb186486f95c633253f296c8a21a7ee65b Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 16 Jan 2025 18:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ad=E6=9C=BA=E8=8F=9C=E8=B0=B1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/controller/CanteenDailyMenuController.java       | 5 +++--
 .../bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java   | 2 +-
 .../bsd/pjcloud/canteen/service/CanteenDailyMenuService.java | 2 +-
 .../canteen/service/impl/CanteenDailyMenuServiceImpl.java    | 4 ++--
 .../src/main/resources/mapper/CanteenDailyMenuMapper.xml     | 3 +++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
index 309a9d382..48dfd1b18 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
@@ -182,9 +182,10 @@ public class CanteenDailyMenuController {
     @SysLog("查询每日菜品列表")
     public R getCanteenList(@RequestParam("day") String day,
                             @RequestParam(value = "hourType", required = false) Integer hourType,
-                            @RequestParam(value = "categoryId", required = false) Long categoryId) {
+                            @RequestParam(value = "categoryId", required = false) Long categoryId,
+                            @RequestParam(value = "merchantId") Long merchantId) {
 
-        return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId));
+        return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId,merchantId));
     }
 
 //    --------------APP---------------
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
index 690178956..5cecab07f 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
@@ -26,5 +26,5 @@ public interface CanteenDailyMenuMapper extends PjcloudBaseMapper<CanteenDailyMe
      * @return
      */
     List<ADCanteenDailyMenuListVO> getCanteenMenuList(@Param("day") String day, @Param("hourType") Integer hourType,
-                                                       @Param("categoryId") Long categoryId, DataScope dataScope);
+                                                       @Param("categoryId") Long categoryId, @Param("merchantId") Long merchantId,DataScope dataScope);
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
index d5f4d3fe6..492f360e3 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
@@ -47,7 +47,7 @@ public interface CanteenDailyMenuService extends IService<CanteenDailyMenuEntity
      * @param categoryId
      * @return
      */
-    List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId);
+    List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId);
 
     Page selectTimeFoodPage(Page page, DailyMenuDTO dailyMenuDTO);
 }
\ No newline at end of file
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 7ff10a6d5..13c06bd42 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
@@ -113,8 +113,8 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
     }
 
     @Override
-    public  List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId) {
-        return baseMapper.getCanteenMenuList(day, hourType, categoryId, DataScope.of());
+    public  List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId) {
+        return baseMapper.getCanteenMenuList(day, hourType, categoryId,merchantId, DataScope.of());
     }
 
     @Override
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
index 43f4e74ab..f4f16de53 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
@@ -76,6 +76,9 @@
             <if test="day != null">
                 AND t.start_time = #{day}
             </if>
+            <if test="merchantId != null">
+                AND t.merchant_id = #{merchantId}
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file