diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java index 5a915ca..8f7ba37 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java @@ -32,7 +32,7 @@ public class BasicStallMealtime extends BaseEntity { /** 餐次类型 */ @Excel(name = "餐次类型") @ApiModelProperty(value = "餐次类型") - private Long mealtimeType; + private Integer mealtimeType; /** 餐次名称 */ @Excel(name = "餐次名称") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeH5Mapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeH5Mapper.java index 98d2ebf..ab4af9e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeH5Mapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeH5Mapper.java @@ -29,7 +29,6 @@ public interface CookRecipeH5Mapper { List selectReserveRecipe(@Param("applyDate") LocalDate applyDate, @Param("recipeId") Long recipeId); - @Select({"select stall_id from menu_recipe ${ew.customSqlSegment}"}) - Long selectStallIdByWrappers(@Param("ew") Wrapper wrapper); + Long selectStallIdByRecipeId(@Param("recipeId") Long recipeId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceH5Impl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceH5Impl.java index 544dee1..524d8ac 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceH5Impl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceH5Impl.java @@ -94,7 +94,7 @@ public class CookRecipeServiceH5Impl implements ICookRecipeH5Service { resultList.sort(Collections.reverseOrder((s1, s2) -> { return s2.getMealtimeType() - s1.getMealtimeType(); })); - Long stallId = cookRecipeH5Mapper.selectStallIdByWrappers(Wrappers.lambdaQuery(CookRecipe.class).eq(CookRecipe::getRecipeId, content.getRecipeId())); + Long stallId = cookRecipeH5Mapper.selectStallIdByRecipeId(content.getRecipeId()); List allocStallMealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeByStallId(stallId); List mealTimeList = allocStallMealtimes; log.info("配置api查询的档口餐次,档口id: {}, 配置: {}", stallId, JSON.toJSONString(mealTimeList)); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml index dbd4cc0..e80a9fd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml @@ -142,5 +142,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by md.dishes_id asc + +