From 0fb5aa0d42e47e6681a3c8dfe9d884ca34b0b80f Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 2 Jul 2025 10:17:48 +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

---
 .../impl/KitchenSampleDishesRecordServiceImpl.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 d4caf8c..5f0a6d2 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
@@ -4,10 +4,13 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
 import cn.hutool.core.collection.CollUtil;
+import com.bonus.canteen.core.basic.domain.BasicStallMealtime;
+import com.bonus.canteen.core.basic.mapper.BasicStallMealtimeMapper;
 import com.bonus.canteen.core.kitchen.domain.constants.CommonFlagEnum;
 import com.bonus.canteen.core.kitchen.domain.constants.SampleDishesSaveStatusEnum;
 import com.bonus.canteen.core.kitchen.domain.constants.SampleDishesSearchType;
@@ -32,6 +35,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishesRecordService {
     @Autowired
     private KitchenSampleDishesRecordMapper kitchenSampleDishesRecordMapper;
+    @Autowired
+    private BasicStallMealtimeMapper basicStallMealtimeMapper;
 
     /**
      * 查询留样机留样清单
@@ -149,6 +154,13 @@ public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishe
 
     public List<KitchenSampleDishesRecord> getDishesByStallAndMealtimeType(KitchenSampleDishesRecord kitchenSampleDishesRecord) {
         kitchenSampleDishesRecord.setApplyDate(LocalDate.now());
+        List<BasicStallMealtime> mealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeByStallId(kitchenSampleDishesRecord.getStallId());
+        for (BasicStallMealtime mealtime : mealtimes) {
+            LocalTime currentTime = LocalTime.now();
+            if (!currentTime.isBefore(mealtime.getStartTime()) && !currentTime.isAfter(mealtime.getEndTime())) {
+                kitchenSampleDishesRecord.setMealtimeType(mealtime.getMealtimeType().longValue());
+            }
+        }
         List<KitchenSampleDishesRecord> fullDishes = kitchenSampleDishesRecordMapper.getDishesByStallAndMealtimeType(kitchenSampleDishesRecord);
         List<KitchenSampleDishesRecord> sampleDishes = new ArrayList<>();
         if(kitchenSampleDishesRecord.getSearchType().equals(SampleDishesSearchType.TODAY.getKey())) {