From 774bc46626b823369cec3cd99c65f5dc9f2f2a35 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 27 May 2025 22:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E8=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CookRecipeServiceImpl.java   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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 5e7f6ed..87025c7 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
@@ -97,14 +97,19 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
         if (1 == cookRecipeDTO.getRecipeType()) { //指定日期
             recipeDateList = cookRecipeDTO.getRecipeDateList();
         } else if (2 == cookRecipeDTO.getRecipeType()) {  //每日循环
+            List<CookRecipeDetailDTO> recipeDetailList = cookRecipeDTO.getRecipeDateList().get(0).getDetailList();
+            //新增详情
             CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
-            cookRecipeDateDTO.setDetailList(cookRecipeDTO.getRecipeDateList().get(0).getDetailList());
+            cookRecipeDateDTO.setDetailList(recipeDetailList);
             LocalDate now = LocalDate.now();
             for (int i = 0; i < 7; ++i) {
                 cookRecipeDateDTO.setApplyDate(now.plusDays(i));
             }
             recipeDateList.add(cookRecipeDateDTO);
-            recipeDateList.add(new CookRecipeDateDTO());
+            //新增模板
+            CookRecipeDateDTO cookRecipeDateDTO2 = new CookRecipeDateDTO();
+            cookRecipeDateDTO2.setDetailList(recipeDetailList);
+            recipeDateList.add(cookRecipeDateDTO2);
         } else if (3 == cookRecipeDTO.getRecipeType()) {  //每周循环
             LocalDate now = LocalDate.now();
             HashMap<Integer, LocalDate> dateHashMap = new HashMap<>();
@@ -112,11 +117,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
                 LocalDate applyWeek = now.plusDays((long) i);
                 dateHashMap.put(applyWeek.getDayOfWeek().getValue(), applyWeek);
             }
-            for (Integer key : dateHashMap.keySet()) {
-                CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
-                cookRecipeDateDTO.setApplyWeek(Long.valueOf(key));
-                recipeDateList.add(cookRecipeDateDTO);
-            }
+            //新增详情
             Iterator<Map.Entry<Integer, LocalDate>> iterator = dateHashMap.entrySet().iterator();
             while (iterator.hasNext()) {
                 Map.Entry<Integer, LocalDate> entry = iterator.next();
@@ -125,6 +126,12 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
                 cookRecipeDateDTO.setApplyDate(entry.getValue());
                 recipeDateList.add(cookRecipeDateDTO);
             }
+            //新增模板
+            for (Integer key : dateHashMap.keySet()) {
+                CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
+                cookRecipeDateDTO.setApplyWeek(Long.valueOf(key));
+                recipeDateList.add(cookRecipeDateDTO);
+            }
         }
         return recipeDateList;
     }