bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增菜谱

This commit is contained in:
sxu 2025-05-27 23:14:05 +08:00
parent 001eb9ba6f
commit 127a8c6c11
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
View File

@ -93,7 +93,11 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
}
private static List<CookRecipeDateDTO> generateCookRecipeDateList(CookRecipeDTO cookRecipeDTO) {
List<CookRecipeDateDTO> recipeDateList = new ArrayList<>();
List<CookRecipeDateDTO> recipeDateList = cookRecipeDTO.getRecipeDateList();
if (CollectionUtils.isEmpty(recipeDateList)) {
return null;
}
List<CookRecipeDateDTO> recipeDateListNew = new ArrayList<>();
if (2 == cookRecipeDTO.getRecipeType()) { //每日循环
List<CookRecipeDetailDTO> recipeDetailList = cookRecipeDTO.getRecipeDateList().get(0).getDetailList();
//新增详情
@ -103,8 +107,9 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
for (int i = 0; i < 7; ++i) {
cookRecipeDateDTO.setApplyDate(now.plusDays(i));
}
recipeDateList.add(cookRecipeDateDTO);
recipeDateListNew.add(cookRecipeDateDTO);
} else if (3 == cookRecipeDTO.getRecipeType()) { //每周循环
List<CookRecipeDateDTO> recipeDateList1 = cookRecipeDTO.getRecipeDateList();
LocalDate now = LocalDate.now();
HashMap<Integer, LocalDate> dateHashMap = new HashMap<>();
for (int i = 0; i < 7; ++i) {
@ -118,7 +123,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
cookRecipeDateDTO.setApplyWeek(Long.valueOf(entry.getKey()));
cookRecipeDateDTO.setApplyDate(entry.getValue());
recipeDateList.add(cookRecipeDateDTO);
recipeDateListNew.add(cookRecipeDateDTO);
}
}
return recipeDateList;
@ -126,20 +131,24 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
private void insertRecipeDetails(CookRecipeDTO cookRecipeDTO, List<CookRecipeDateDTO> generatedRecipeDateList) {
// 插入指定日期、日循环摸板、周循环模板
for (CookRecipeDateDTO recipeDateDTO :cookRecipeDTO.getRecipeDateList() ) {
List<CookRecipeDetailDTO> detailList = recipeDateDTO.getDetailList();
for (CookRecipeDetailDTO detailDTO : detailList) {
if (1 == cookRecipeDTO.getRecipeType() && CollectionUtils.isEmpty(detailDTO.getDishesList())) { //指定日期，不插入空数据
continue;
if (!CollectionUtils.isEmpty(cookRecipeDTO.getRecipeDateList())) {
for (CookRecipeDateDTO recipeDateDTO : cookRecipeDTO.getRecipeDateList()) {
List<CookRecipeDetailDTO> detailList = recipeDateDTO.getDetailList();
for (CookRecipeDetailDTO detailDTO : detailList) {
if (1 == cookRecipeDTO.getRecipeType() && CollectionUtils.isEmpty(detailDTO.getDishesList())) { //指定日期，不插入空数据
continue;
}
insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
}
insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
}
}
// 插入日循环、周循环详情
for (CookRecipeDateDTO recipeDateDTO : generatedRecipeDateList) {
List<CookRecipeDetailDTO> detailList = recipeDateDTO.getDetailList();
for (CookRecipeDetailDTO detailDTO : detailList) {
insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
if (!CollectionUtils.isEmpty(generatedRecipeDateList)) {
for (CookRecipeDateDTO recipeDateDTO : generatedRecipeDateList) {
List<CookRecipeDetailDTO> detailList = recipeDateDTO.getDetailList();
for (CookRecipeDetailDTO detailDTO : detailList) {
insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
}
}
}
}