diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java index ebb47063..a93c05ef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java @@ -1,8 +1,10 @@ package com.bonus.core.menu.controller; import com.bonus.core.menu.dto.AppletWeekCanteenDTO; +import com.bonus.core.menu.dto.AppletWeekRecipeDTO; import com.bonus.core.menu.service.MenuRecipeService; import com.bonus.core.menu.vo.AppletWeekCanteenVO; +import com.bonus.core.menu.vo.AppletWeekRecipeVO; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; import java.util.List; @RestController @@ -28,4 +32,9 @@ public class AppletRecipeV2Controller { return this.menuRecipeService.getWeekMealList(appletWeekCanteenDTO); } + @ApiOperation("获取一周菜谱详情") + @PostMapping({"/week/recipe/detail"}) + public List getWeekRecipeDetailList(@RequestBody @Valid AppletWeekRecipeDTO content) { + return this.menuRecipeService.getWeekRecipeDetailList(content); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java index 1567c51b..0c93fcff 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bonus.common.core.exception.ServiceException;