From e58f0e02565900cce8540122330a099659cad530 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 2 Jul 2025 10:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E6=A1=A3?= =?UTF-8?q?=E5=8F=A3=E9=A4=90=E6=AC=A1=E7=9A=84=E6=89=80=E6=9C=89=E8=8F=9C?= =?UTF-8?q?=E5=93=81=E5=8F=8A=E5=85=B6=E7=95=99=E6=A0=B7=E7=89=B9=E5=BE=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/basic/mapper/BasicStallMealtimeMapper.java | 2 +- .../cook/service/impl/CookRecipeServiceH5Impl.java | 4 +++- .../impl/KitchenSampleDishesRecordServiceImpl.java | 4 +++- .../mapper/basic/BasicStallMealtimeMapper.xml | 12 ++++++------ 4 files changed, 13 insertions(+), 9 deletions(-) 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)