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 a5d7293..2f9ca13 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 @@ -88,8 +88,28 @@ public class CookRecipeServiceImpl implements ICookRecipeService { } private void createRecipeDetails(CookRecipeDTO cookRecipeDTO, boolean isCreate) { + // 插入指定日期、日循环摸板、周循环模板 + if (!CollectionUtils.isEmpty(cookRecipeDTO.getRecipeDateList())) { + for (CookRecipeDateDTO recipeDateDTO : cookRecipeDTO.getRecipeDateList()) { + List detailList = recipeDateDTO.getDetailList(); + for (CookRecipeDetailDTO detailDTO : detailList) { + if (1 == cookRecipeDTO.getRecipeType() && CollectionUtils.isEmpty(detailDTO.getDishesList())) { //指定日期,不插入空数据 + continue; + } + insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO); + } + } + } + // 插入日循环、周循环详情 List generatedRecipeDateList = generateCookRecipeDateList(cookRecipeDTO); - insertRecipeDetails(cookRecipeDTO, generatedRecipeDateList); + if (!CollectionUtils.isEmpty(generatedRecipeDateList)) { + for (CookRecipeDateDTO recipeDateDTO : generatedRecipeDateList) { + List detailList = recipeDateDTO.getDetailList(); + for (CookRecipeDetailDTO detailDTO : detailList) { + insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO); + } + } + } } private static List generateCookRecipeDateList(CookRecipeDTO cookRecipeDTO) { @@ -133,30 +153,6 @@ public class CookRecipeServiceImpl implements ICookRecipeService { return recipeDateList; } - private void insertRecipeDetails(CookRecipeDTO cookRecipeDTO, List generatedRecipeDateList) { - // 插入指定日期、日循环摸板、周循环模板 - if (!CollectionUtils.isEmpty(cookRecipeDTO.getRecipeDateList())) { - for (CookRecipeDateDTO recipeDateDTO : cookRecipeDTO.getRecipeDateList()) { - List detailList = recipeDateDTO.getDetailList(); - for (CookRecipeDetailDTO detailDTO : detailList) { - if (1 == cookRecipeDTO.getRecipeType() && CollectionUtils.isEmpty(detailDTO.getDishesList())) { //指定日期,不插入空数据 - continue; - } - insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO); - } - } - } - // 插入日循环、周循环详情 - if (!CollectionUtils.isEmpty(generatedRecipeDateList)) { - for (CookRecipeDateDTO recipeDateDTO : generatedRecipeDateList) { - List detailList = recipeDateDTO.getDetailList(); - for (CookRecipeDetailDTO detailDTO : detailList) { - insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO); - } - } - } - } - private void insertDetailAndDishes(CookRecipeDTO cookRecipeDTO, CookRecipeDateDTO recipeDateDTO, CookRecipeDetailDTO detailDTO) { CookRecipeDetail cookRecipeDetail = new CookRecipeDetail(); BeanUtils.copyProperties(recipeDateDTO, detailDTO);