diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicStallMealtimeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicStallMealtimeMapper.java index 7d884b0..c2114a4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicStallMealtimeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicStallMealtimeMapper.java @@ -63,5 +63,5 @@ public interface BasicStallMealtimeMapper { public int deleteBasicStallMealtimeByStallId(Long stallId); - public List selectBasicStallMealtimeByStallId(Long stallId); + //public List selectBasicStallMealtimeByStallId(Long stallId); } 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 edae396..2b00e99 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 @@ -97,7 +97,9 @@ public class CookRecipeServiceH5Impl implements ICookRecipeH5Service { return s2.getMealtimeType() - s1.getMealtimeType(); })); Long stallId = cookRecipeH5Mapper.selectStallIdByRecipeId(content.getRecipeId()); - List allocStallMealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeByStallId(stallId); + BasicStallMealtime basicStallMealtime = new BasicStallMealtime(); + basicStallMealtime.setStallId(stallId); + List allocStallMealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeList(basicStallMealtime); List mealTimeList = allocStallMealtimes; log.info("配置api查询的档口餐次,档口id: {}, 配置: {}", stallId, JSON.toJSONString(mealTimeList)); if (ObjectUtil.isEmpty(mealTimeList)) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java index 5f0a6d2..6e90042 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java @@ -154,7 +154,9 @@ public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishe public List getDishesByStallAndMealtimeType(KitchenSampleDishesRecord kitchenSampleDishesRecord) { kitchenSampleDishesRecord.setApplyDate(LocalDate.now()); - List mealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeByStallId(kitchenSampleDishesRecord.getStallId()); + BasicStallMealtime basicStallMealtime = new BasicStallMealtime(); + basicStallMealtime.setStallId(kitchenSampleDishesRecord.getStallId()); + List mealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeList(basicStallMealtime); for (BasicStallMealtime mealtime : mealtimes) { LocalTime currentTime = LocalTime.now(); if (!currentTime.isBefore(mealtime.getStartTime()) && !currentTime.isAfter(mealtime.getEndTime())) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicStallMealtimeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicStallMealtimeMapper.xml index 85b6685..524b562 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicStallMealtimeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicStallMealtimeMapper.xml @@ -25,13 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -40,10 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + + insert into basic_stall_mealtime(stall_id, mealtime_type, mealtime_name, start_time, end_time, if_enable)