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

5456

This commit is contained in:
gaowdong 2025-03-27 13:20:53 +08:00
parent 4f9a342eb9
commit ce7dcfb2c1
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,10 @@ import java.util.List;
@Mapper
public interface MenuMaterialMapper extends BaseMapper<MenuMaterial> {
List<MenuMaterialPageVO> selectAllList(@Param("delFlag") Integer delFlag, @Param("content") MenuMaterialPageDTO content, @Param("categoryIdList") List<Long> categoryIdList);
List<MenuMaterialPageVO> selectAllList(@Param("delFlag") Integer delFlag,
@Param("content") MenuMaterialPageDTO content,
@Param("categoryIdList") List<Long> categoryIdList,
@Param("merchantId") Long merchantId);
List<MenuMaterialDishesPageVO> selectListByDishesId(MenuMaterialDishes materialDishes);

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

@ -335,7 +335,7 @@ public class MenuMaterialServiceImpl extends ServiceImpl<MenuMaterialMapper, Men
content.setAreaAuth(this.drpAuthorityApi.listAreaAuth());
PageMethod.startPage(content);
List<MenuMaterialPageVO> records = this.baseMapper
.selectAllList(DelFlagEnum.DEL_FALSE.key(), content, categoryIdList);
.selectAllList(DelFlagEnum.DEL_FALSE.key(), content, categoryIdList, TenantContextHolder.getTenantId());
List<Long> materialIdList = records.stream().map(MenuMaterialPageVO::getMaterialId).collect(Collectors.toList());
if (CollUtil.isEmpty(materialIdList)) {
return records;

10
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
View File

@ -71,7 +71,15 @@
left join menu_nutrition mn on mm.nutrition_id = mn.nutrition_id
left join menu_material_category mmc on mm.category_id = mmc.category_id
left join drp_unit du on du.unit_id = mm.unit_id
left join alloc_area aa on mm.area_id = aa.area_id
left join (
SELECT #{merchantId} AS area_id,
merchant_name AS area_name
FROM merc_merchant
UNION ALL
SELECT area_id AS area_id,
area_name AS area_name
FROM alloc_area
) aa on mm.area_id = aa.area_id
left join drp_certificate dc on dc.cert_id = mm.cert_id
where
mm.del_flag = #{delFlag}