From 557d3e73e43105e0e6520ee4e61e5d4b62c2e78f Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 16 Jan 2025 18:06:46 +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 --- .../api/feign/RemoteDailyMenuService.java | 16 ++++++++++++++++ .../controller/CanteenDailyMenuController.java | 9 +++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java index a0333e12b..fe2ed83f6 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java @@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO; import com.bsd.pjcloud.canteen.dto.DailyMenuAll; import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO; +import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO; import com.bsd.pjcloud.canteen.vo.APPOnlineSpuVO; import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; @@ -67,4 +68,19 @@ public interface RemoteDailyMenuService { @RequestParam("merchantId") Long merchantId, @RequestParam("categoryId") Long categoryId); + + /** + * 根据菜品日期获取当天的菜品列表 + * @param day 日期 + * @param hourType 早中晚 + * @param categoryId 分类id + * @param merchantId 商户id + * @return + */ + @GetMapping("/canteenDailyMenu/ad/getCanteenList") + public R> getCanteenList(@RequestParam("day") String day, + @RequestParam(value = "hourType", required = false) Integer hourType, + @RequestParam(value = "categoryId", required = false) Long categoryId, + @RequestParam(value = "merchantId") Long merchantId); + } 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 48dfd1b18..fe0e6deaf 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 @@ -12,6 +12,7 @@ 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.service.CanteenSpuService; +import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity; @@ -180,10 +181,10 @@ public class CanteenDailyMenuController { // ---------AD------------ @GetMapping("/ad/getCanteenList") @SysLog("查询每日菜品列表") - public R getCanteenList(@RequestParam("day") String day, - @RequestParam(value = "hourType", required = false) Integer hourType, - @RequestParam(value = "categoryId", required = false) Long categoryId, - @RequestParam(value = "merchantId") Long merchantId) { + public R> getCanteenList(@RequestParam("day") String day, + @RequestParam(value = "hourType", required = false) Integer hourType, + @RequestParam(value = "categoryId", required = false) Long categoryId, + @RequestParam(value = "merchantId") Long merchantId) { return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId,merchantId)); }