diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java index d7a531a..89ee7c1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java @@ -535,7 +535,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService { if (!ObjectUtil.isEmpty(menuRecipes)) { Map recipeMap = (Map)menuRecipes.stream().collect(Collectors.toMap(CookRecipe::getRecipeId, Function.identity())); List menuRecipeDetails = cookRecipeDetailMapper.getCookRecipeDetailsByDetailTypeAndRecipeIds(recipeIdList); - Map recipeTypeMap = (Map)menuRecipes.stream().collect(Collectors.toMap(CookRecipe::getRecipeId, CookRecipe::getRecipeType)); + Map recipeTypeMap = (Map)menuRecipes.stream().collect(Collectors.toMap(CookRecipe::getRecipeId, CookRecipe::getRecipeType)); menuRecipeDetails = this.filterCookRecipeDetails(recipeTypeMap, menuRecipeDetails, applyDate); if (!ObjectUtil.isEmpty(menuRecipeDetails)) { Map> detailMap = (Map)menuRecipeDetails.stream().collect(Collectors.groupingBy(CookRecipeDetail::getRecipeId)); @@ -552,7 +552,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService { newRecipeDetail.setCreateBy("JOB"); newRecipeDetail.setCreateTime(DateUtils.getNowDate()); newRecipeDetail.setRecipeId(recipeId); - Integer recipeType = recipeTypeMap.get(recipeId); + Long recipeType = recipeTypeMap.get(recipeId); if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) { newRecipeDetail.setApplyWeek((long)applyDate.getDayOfWeek().getValue()); } @@ -581,10 +581,10 @@ public class CookRecipeServiceImpl implements ICookRecipeService { } } - public List filterCookRecipeDetails(Map recipeTypeMap, List cookRecipeDetails, LocalDate applyDate) { + public List filterCookRecipeDetails(Map recipeTypeMap, List cookRecipeDetails, LocalDate applyDate) { return (List)cookRecipeDetails.stream().filter((item) -> { Long recipeId = item.getRecipeId(); - Integer type = (Integer)recipeTypeMap.get(recipeId); + Long type = (Long)recipeTypeMap.get(recipeId); if (type == 3) { return ObjectUtil.equal(item.getApplyWeek(), applyDate.getDayOfWeek().getValue()); } else {