diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java index 5fdc044f..95d49102 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java @@ -1,9 +1,11 @@ package com.bonus.core.menu.mapper; import com.bonus.core.marketing.vo.MktEffectiveUserVO; +import com.bonus.core.menu.vo.AppletWeekRecipeVO; import com.bonus.domain.CustInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.time.LocalDate; import java.util.List; @Mapper @@ -12,4 +14,6 @@ public interface MenuRecipeMapper { CustInfo selectOrgAndPsnByCustLimitId(CustInfo custInfo); List selectAllUserEff(@Param("effType") Integer effType, @Param("delFlag") Integer delFlag); + List selectWeekRecipe(@Param("applyDate") LocalDate applyDate, @Param("recipeId") Long recipeId, @Param("recipeIdList") List recipeIdList); + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java index 43839d43..6f74bf0f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -95,8 +95,8 @@ public class MenuRecipeServiceImpl implements MenuRecipeService { ((List)recipeIdList).add(content.getRecipeId()); } - this.generateRecipe((List)recipeIdList, content.getApplyDate()); - List resultList = ((MenuRecipeMapper)this.baseMapper).selectWeekRecipe(content.getApplyDate(), content.getRecipeId(), (List)recipeIdList); + //this.generateRecipe((List)recipeIdList, content.getApplyDate()); + List resultList = menuRecipeMapper.selectWeekRecipe(content.getApplyDate(), content.getRecipeId(), (List)recipeIdList); resultList.sort(Collections.reverseOrder((s1, s2) -> { return s2.getMealtimeType() - s1.getMealtimeType(); })); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml index fa376398..79b64838 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml @@ -16,6 +16,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +