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

h5周菜谱

This commit is contained in:
sxu 2025-06-08 09:06:08 +08:00
parent 0005d5861f
commit 0f9b5a20f0
2 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDetailMapper.java
View File

@ -78,7 +78,7 @@ public interface CookRecipeDetailMapper {
List<CookRecipeDetail> getByRecipeIdAndDatesAndIntervalId(@Param("recipeId") Long recipeId, @Param("dateList") Set<LocalDate> dateList, @Param("mealtimeType") Long mealtimeType); List<CookRecipeDetail> getByRecipeIdAndDatesAndIntervalId(@Param("recipeId") Long recipeId, @Param("dateList") Set<LocalDate> dateList, @Param("mealtimeType") Long mealtimeType);
List<CookRecipeDetail> getCookRecipeDetailsByApplyDateAndRecipeIds(@Param("recipeIdList") List<Long> recipeIdList); List<CookRecipeDetail> getCookRecipeDetailsByApplyDateAndRecipeIds(@Param("recipeIdList") List<Long> recipeIdList, @Param("applyDate") LocalDate applyDate);
List<CookRecipeDetail> getCookRecipeDetailsByDetailTypeAndRecipeIds(@Param("recipeIdList") List<Long> recipeIdList); List<CookRecipeDetail> getCookRecipeDetailsByDetailTypeAndRecipeIds(@Param("recipeIdList") List<Long> recipeIdList);
} }

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

@ -527,7 +527,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
public synchronized void generateRecipe(List<Long> inputRecipeIdList, LocalDate applyDate) { public synchronized void generateRecipe(List<Long> inputRecipeIdList, LocalDate applyDate) {
if (!ObjectUtil.isEmpty(inputRecipeIdList) && !ObjectUtil.isEmpty(applyDate)) { if (!ObjectUtil.isEmpty(inputRecipeIdList) && !ObjectUtil.isEmpty(applyDate)) {
List<Long> recipeIdList = new ArrayList(inputRecipeIdList); List<Long> recipeIdList = new ArrayList(inputRecipeIdList);
List<CookRecipeDetail> cookRecipeDetails = cookRecipeDetailMapper.getCookRecipeDetailsByApplyDateAndRecipeIds(recipeIdList); List<CookRecipeDetail> cookRecipeDetails = cookRecipeDetailMapper.getCookRecipeDetailsByApplyDateAndRecipeIds(recipeIdList, applyDate);
Map<Long, Long> recipeDetailContMap = cookRecipeDetails.stream().collect(Collectors.groupingBy(CookRecipeDetail::getRecipeId, Collectors.counting())); Map<Long, Long> recipeDetailContMap = cookRecipeDetails.stream().collect(Collectors.groupingBy(CookRecipeDetail::getRecipeId, Collectors.counting()));
recipeIdList.removeAll(recipeDetailContMap.keySet()); recipeIdList.removeAll(recipeDetailContMap.keySet());
if (!ObjectUtil.isEmpty(recipeIdList)) { if (!ObjectUtil.isEmpty(recipeIdList)) {
@ -544,57 +544,35 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
Map<Long, List<CookRecipeDishes>> recipeDishes = (Map)foundDishes.stream().collect(Collectors.groupingBy(CookRecipeDishes::getRecipeDetailId)); Map<Long, List<CookRecipeDishes>> recipeDishes = (Map)foundDishes.stream().collect(Collectors.groupingBy(CookRecipeDishes::getRecipeDetailId));
List<CookRecipeDetail> recipeDetailV2List = Lists.newArrayList(); List<CookRecipeDetail> recipeDetailV2List = Lists.newArrayList();
List<CookRecipeDishes> recipeDishesV2List = Lists.newArrayList(); List<CookRecipeDishes> recipeDishesV2List = Lists.newArrayList();
Iterator var13 = recipeMap.keySet().iterator(); for (Long recipeId : recipeMap.keySet()) {
// label59: CookRecipe recipe = recipeMap.get(recipeId);
// while(true) { List<CookRecipeDetail> cookRecipeDetailList = (List) detailMap.get(recipeId);
// Long recipeId; for (CookRecipeDetail oldDetail : cookRecipeDetailList) {
// Integer type; Long oldDetailId = oldDetail.getRecipeDetailId();
// List menuRecipeDetail; CookRecipeDetail newRecipeDetail = new CookRecipeDetail();
// do { newRecipeDetail.setRecipeId(recipeId);
// if (!var13.hasNext()) { Integer recipeType = recipeTypeMap.get(recipeId);
// this.cookRecipeDetailMapper.insert(recipeDetailV2List); if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) {
// if (ObjectUtil.isNotEmpty(recipeDishesV2List)) { newRecipeDetail.setApplyWeek((long)applyDate.getDayOfWeek().getValue());
// this.cookRecipeDishesService.saveBatch(recipeDishesV2List); }
// } newRecipeDetail.setApplyDate(applyDate);
// return; newRecipeDetail.setCreateBy("JOB");
// } newRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key());
// recipeId = (Long)var13.next(); cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划
// type = (Integer)recipeTypeMap.get(recipeId); Long newDetailId = newRecipeDetail.getRecipeDetailId();
// menuRecipeDetail = (List)detailMap.get(recipeId); List<CookRecipeDishes> dishes = recipeDishes.get(oldDetailId);
// } while(!ObjectUtil.isNotEmpty(menuRecipeDetail)); for (CookRecipeDishes dishesDTO : dishes) {
// Iterator var17 = menuRecipeDetail.iterator(); CookRecipeDishes newRecipeDishes = new CookRecipeDishes();
// while(true) { BeanUtils.copyProperties(dishesDTO, newRecipeDishes);
// Long detailId; newRecipeDishes.setCreateTime(DateUtils.getNowDate());
// List dishes; long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 0 : newRecipeDishes.getSupplyNum();
// do { long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum();
// if (!var17.hasNext()) { newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum));
// continue label59; newRecipeDishes.setRecipeDetailId(newDetailId);
// } cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes); //插入菜谱之菜品详情
// CookRecipeDetail recipeDetail = (CookRecipeDetail)var17.next(); }
// CookRecipeDetail detailItem = new CookRecipeDetail(); }
// detailId = Id.next(); }
// detailItem.setDetailId(detailId);
// detailItem.setRecipeId(recipeId);
// if (ObjectUtil.equal(type, 3)) {
// detailItem.setApplyWeek(applyDate.getDayOfWeek().getValue());
// }
// detailItem.setApplyDate(applyDate);
// detailItem.setMealtimeType(recipeDetail.getMealtimeType());
// detailItem.setCreateBy("");
// detailItem.setDetailType(2);
// recipeDetailV2List.add(detailItem);
// dishes = (List)recipeDishes.get(recipeDetail.getDetailId());
// } while(!ObjectUtil.isNotEmpty(dishes));
// Iterator var22 = dishes.iterator();
// while(var22.hasNext()) {
// CookRecipeDishes dish = (CookRecipeDishes)var22.next();
// CookRecipeDishes dishesItem = (CookRecipeDishes) BeanUtil.copyProperties(dish, CookRecipeDishes.class, new String[0]);
// dishesItem.setDetailId(detailId);
// dishesItem.setId((Long)null);
// recipeDishesV2List.add(dishesItem);
// }
// }
// }
} }
} }
} }