diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java index 6b6d145b..46f974a2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java @@ -32,4 +32,6 @@ public interface MenuRecipeDetailMapper extends BaseMapper { List selectIssueRecipeV2Compress(@Param("issueRecipeV2DTO") IssueRecipeV2DTO issueRecipeV2DTO); + List selectDateDetailList(@Param("recipeId") Long recipeId, @Param("applyDate") LocalDate applyDate); + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java index 71a8a2c1..ea6e90c4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -1177,7 +1177,9 @@ public class MenuRecipeServiceImpl extends ServiceImpl getMenuRecipeDateDetail(MenuRecipeDetailDateDTO content) { - return Collections.emptyList(); + this.generateRecipe(content.getRecipeId(), content.getApplyDate()); + List menuRecipeDetailDateVOS = this.menuRecipeDetailMapper.selectDateDetailList(content.getRecipeId(), content.getApplyDate()); + return menuRecipeDetailDateVOS.stream().sorted(Comparator.comparing(MenuRecipeDetailDateVO::getMealtimeType)).collect(Collectors.toList()); } @Override diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml index 57ff2027..1045c01b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml @@ -220,4 +220,39 @@ order by mrdd.sort_num asc + + +