修改ad机菜谱接口

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---------------

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);
 }

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);
 }

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

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>