zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改ad机菜谱接口

Browse Source
This commit is contained in:
zjf committed 2025-01-16 18:06:46 +08:00
1 parent 5738d0cf58
commit 557d3e73e4
2 files changed
+21 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java
+16
View File
@@ -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<List<ADCanteenDailyMenuListVO>> getCanteenList(@RequestParam("day") String day,
@RequestParam(value = "hourType", required = false) Integer hourType,
@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam(value = "merchantId") Long merchantId);
}
pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
+5 -4
View File
@@ -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<List<ADCanteenDailyMenuListVO>> 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));
}