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 ee5b813..7cfaaef 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 @@ -1,6 +1,5 @@ package com.bonus.canteen.core.cook.service.impl; -import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -553,8 +552,6 @@ 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(); for (Long recipeId : recipeMap.keySet()) { List cookRecipeDetailList = detailMap.get(recipeId); if (!CollectionUtils.isEmpty(cookRecipeDetailList)) { @@ -575,20 +572,22 @@ public class CookRecipeServiceImpl implements ICookRecipeService { cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划 Long newDetailId = newRecipeDetail.getRecipeDetailId(); List dishes = recipeDishes.get(oldDetailId); - for (CookRecipeDishes dishesDTO : dishes) { - CookRecipeDishes newRecipeDishes = new CookRecipeDishes(); - BeanUtils.copyProperties(dishesDTO, newRecipeDishes); - newRecipeDishes.setCreateBy("JOB"); - newRecipeDishes.setCreateTime(DateUtils.getNowDate()); - long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 9999 : newRecipeDishes.getSupplyNum(); - long limitNum = Objects.isNull(newRecipeDishes.getLimitNum()) ? 9999 : newRecipeDishes.getLimitNum(); - long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum(); - newRecipeDishes.setSupplyNum(supplyNum); - newRecipeDishes.setLimitNum(limitNum); - newRecipeDishes.setSaleNum(saleNum); - newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum)); - newRecipeDishes.setRecipeDetailId(newDetailId); - cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes); //插入菜谱之菜品详情 + if (!CollectionUtils.isEmpty(dishes)) { + for (CookRecipeDishes dishesDTO : dishes) { + CookRecipeDishes newRecipeDishes = new CookRecipeDishes(); + BeanUtils.copyProperties(dishesDTO, newRecipeDishes); + newRecipeDishes.setCreateBy("JOB"); + newRecipeDishes.setCreateTime(DateUtils.getNowDate()); + long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 9999 : newRecipeDishes.getSupplyNum(); + long limitNum = Objects.isNull(newRecipeDishes.getLimitNum()) ? 9999 : newRecipeDishes.getLimitNum(); + long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum(); + newRecipeDishes.setSupplyNum(supplyNum); + newRecipeDishes.setLimitNum(limitNum); + newRecipeDishes.setSaleNum(saleNum); + newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum)); + newRecipeDishes.setRecipeDetailId(newDetailId); + cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes); //插入菜谱之菜品详情 + } } } }