bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-03-05 15:54:11 +08:00
parent b62326f45c 4ac8211277
commit 8206e7c962
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java
View File

@ -32,4 +32,6 @@ public interface MenuRecipeDetailMapper extends BaseMapper<MenuRecipeDetail> {
List<IssueRecipeDateCompressVO> selectIssueRecipeV2Compress(@Param("issueRecipeV2DTO") IssueRecipeV2DTO issueRecipeV2DTO);
List<MenuRecipeDetailDateVO> selectDateDetailList(@Param("recipeId") Long recipeId, @Param("applyDate") LocalDate applyDate);
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java
View File

@ -1177,7 +1177,9 @@ public class MenuRecipeServiceImpl extends ServiceImpl<MenuRecipeMapper, MenuRec
@Override
public List<MenuRecipeDetailDateVO> getMenuRecipeDateDetail(MenuRecipeDetailDateDTO content) {
return Collections.emptyList();
this.generateRecipe(content.getRecipeId(), content.getApplyDate());
List<MenuRecipeDetailDateVO> menuRecipeDetailDateVOS = this.menuRecipeDetailMapper.selectDateDetailList(content.getRecipeId(), content.getApplyDate());
return menuRecipeDetailDateVOS.stream().sorted(Comparator.comparing(MenuRecipeDetailDateVO::getMealtimeType)).collect(Collectors.toList());
}
@Override

35
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml
View File

@ -220,4 +220,39 @@
order by mrdd.sort_num asc
</select>
<!-- 获取指定日期菜谱详情 -->
<select id="selectDateDetailList" resultMap="menuRecipeDetailDateVO">
select mrd.mealtime_type,
mrd.detail_id,
mdb.base_dishes_id as dishes_id,
mdb.dishes_name,
mrdd.id,
mrdd.price,
mrdd.size_type,
mrdd.supply_num,
mrdd.sale_num,
mrdd.surplus_num,
mrdd.restrict_num,
mrdd.sale_price,
mrdd.recommend_flag,
mrdd.sort_num,
ac.canteen_name,
md.sales_mode,
md.unit_price,
md.meal_type,
md.dishes_num,
md.type_id,
mdt.type_name,
md.material_cost
from menu_recipe_detail mrd
left join menu_recipe_dishes mrdd on mrd.detail_id = mrdd.detail_id
left join menu_dishes md on mrdd.dishes_id = md.dishes_id
left join alloc_canteen ac on md.canteen_id = ac.canteen_id
left join menu_dishes_base mdb on md.base_dishes_id = mdb.base_dishes_id
left join menu_dishes_type mdt on md.type_id = mdt.type_id
where mrd.recipe_id = #{recipeId}
and mrd.apply_date = #{applyDate}
order by mrdd.sort_num
</select>
</mapper>