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 97257ee..d7a531a 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 @@ -542,22 +542,24 @@ public class CookRecipeServiceImpl implements ICookRecipeService { List detailIds = (List)menuRecipeDetails.stream().map(CookRecipeDetail::getRecipeDetailId).collect(Collectors.toList()); List foundDishes = cookRecipeDishesMapper.selectCookRecipeDishesByDetailIds(detailIds); Map> recipeDishes = (Map)foundDishes.stream().collect(Collectors.groupingBy(CookRecipeDishes::getRecipeDetailId)); - List recipeDetailV2List = Lists.newArrayList(); - List recipeDishesV2List = Lists.newArrayList(); + //List recipeDetailV2List = Lists.newArrayList(); + //List recipeDishesV2List = Lists.newArrayList(); for (Long recipeId : recipeMap.keySet()) { - CookRecipe recipe = recipeMap.get(recipeId); - List cookRecipeDetailList = (List) detailMap.get(recipeId); + List cookRecipeDetailList = detailMap.get(recipeId); for (CookRecipeDetail oldDetail : cookRecipeDetailList) { Long oldDetailId = oldDetail.getRecipeDetailId(); CookRecipeDetail newRecipeDetail = new CookRecipeDetail(); + newRecipeDetail.setCreateBy("JOB"); + newRecipeDetail.setCreateTime(DateUtils.getNowDate()); newRecipeDetail.setRecipeId(recipeId); Integer recipeType = recipeTypeMap.get(recipeId); if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) { newRecipeDetail.setApplyWeek((long)applyDate.getDayOfWeek().getValue()); } newRecipeDetail.setApplyDate(applyDate); - newRecipeDetail.setCreateBy("JOB"); newRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key()); + newRecipeDetail.setMealtimeType(oldDetail.getMealtimeType()); + newRecipeDetail.setSaleTypeId(oldDetail.getSaleTypeId()); cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划 Long newDetailId = newRecipeDetail.getRecipeDetailId(); List dishes = recipeDishes.get(oldDetailId);