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 getDishesByStallAndMealtimeType(KitchenSampleDishesRecord kitchenSampleDishesRecord) { kitchenSampleDishesRecord.setApplyDate(LocalDate.now()); + List 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 fullDishes = kitchenSampleDishesRecordMapper.getDishesByStallAndMealtimeType(kitchenSampleDishesRecord); List sampleDishes = new ArrayList<>(); if(kitchenSampleDishesRecord.getSearchType().equals(SampleDishesSearchType.TODAY.getKey())) {