diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java index d2beec13..d689b9b5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java @@ -6,7 +6,7 @@ import com.bonus.core.menu.utils.NutritionEntity; import java.util.Map; -public interface MenuDishesService extends IService { +public interface MenuDishesService { // Long addMenuDishes(MenuDishesAddDTO dishesAddDTO, Integer customId); // // Page getMenuDishesPage(String content); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java index 82060c24..2cfc122e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java @@ -16,6 +16,8 @@ import com.bonus.core.menu.utils.NutritionEntity; import com.bonus.core.menu.utils.NutritionEntityUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.List; @@ -23,7 +25,7 @@ import java.util.Map; import java.util.stream.Collectors; @Service -public class MenuDishesServiceImpl extends ServiceImpl implements MenuDishesService { +public class MenuDishesServiceImpl implements MenuDishesService { private static final Logger log = LoggerFactory.getLogger(MenuDishesServiceImpl.class); // @Lazy @@ -115,9 +117,9 @@ public class MenuDishesServiceImpl extends ServiceImpl dishesQuantityMap) { + LogUtil.info("查询营养信息", dishesQuantityMap); + if (CollUtil.isNotEmpty(dishesQuantityMap)) { + List dishesIdList = ListUtil.toList(dishesQuantityMap.keySet()); + List menuDishesList = this.getMenuDishesList(dishesIdList); + if (CollUtil.isNotEmpty(menuDishesList)) { + List nutritionEntityList = (List)menuDishesList.stream().map((item) -> { + Double weight = (Double)dishesQuantityMap.get(item.getDishesId()); + NutritionEntity nutritionEntity = (NutritionEntity) BeanUtil.copyProperties(item, NutritionEntity.class, new String[0]); + nutritionEntity.setWeight(weight); + nutritionEntity.setBaseWeight(item.getWeight()); + return nutritionEntity; + }).collect(Collectors.toList()); + return NutritionEntityUtil.countNutrition(nutritionEntityList); + } + } + + return new NutritionEntity(); + } + + public List getMenuDishesList(List dishesIdList) { + return null; +// menuDishesMapper.list((Wrapper)((LambdaQueryWrapper) Wrappers.lambdaQuery(MenuDishes.class) +// .in(MenuDishes::getDishesId, dishesIdList)).eq(MenuDishes::getDelFlag, LeConstants.COMMON_NO)); + } // public Long addMenuDishes(MenuDishesAddDTO dishesAddDTO, Integer customId) { // Long count = ((MenuDishesMapper)this.baseMapper).selectCount((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuDishes.class).eq(MenuDishes::getDishesName, dishesAddDTO.getDishesName())).eq(MenuDishes::getDelFlag, DelFlagEnum.DEL_FALSE.key())); // if (count != null && count > 0L) { @@ -2551,31 +2580,6 @@ public class MenuDishesServiceImpl extends ServiceImpl dishesQuantityMap) { - LogUtil.info("查询营养信息", dishesQuantityMap); - if (CollUtil.isNotEmpty(dishesQuantityMap)) { - List dishesIdList = ListUtil.toList(dishesQuantityMap.keySet()); - List menuDishesList = this.getMenuDishesList(dishesIdList); - if (CollUtil.isNotEmpty(menuDishesList)) { - List nutritionEntityList = (List)menuDishesList.stream().map((item) -> { - Double weight = (Double)dishesQuantityMap.get(item.getDishesId()); - NutritionEntity nutritionEntity = (NutritionEntity) BeanUtil.copyProperties(item, NutritionEntity.class, new String[0]); - nutritionEntity.setWeight(weight); - nutritionEntity.setBaseWeight(item.getWeight()); - return nutritionEntity; - }).collect(Collectors.toList()); - return NutritionEntityUtil.countNutrition(nutritionEntityList); - } - } - - return new NutritionEntity(); - } - - public List getMenuDishesList(List dishesIdList) { - return this.list((Wrapper)((LambdaQueryWrapper) Wrappers.lambdaQuery(MenuDishes.class) - .in(MenuDishes::getDishesId, dishesIdList)).eq(MenuDishes::getDelFlag, LeConstants.COMMON_NO)); - } // // public void updateDishesNutrition(List materialIds) { // List menuUpdateDishesModels = this.menuMaterialDishesService.selectDishesList(materialIds);