zhuyifan

fix

......@@ -242,12 +242,12 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
queryWrapper.eq(MealOrder::getEnterpriseId, request.getEnterpriseId());
queryWrapper.in(!request.getDinerIdsList().isEmpty(), MealOrder::getDinerId, request.getDinerIdsList());
LocalDate today = LocalDate.now();
LocalDate thisMonday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
LocalDateTime thisMondayStart = LocalDateTime.of(thisMonday, LocalTime.MIN);
LocalDate thisSunday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
LocalDateTime thisSundayEnd = LocalDateTime.of(thisSunday, LocalTime.MAX);
queryWrapper.ge(MealOrder::getReserveDate, thisMondayStart);
queryWrapper.lt(MealOrder::getReserveDate, thisSundayEnd);
LocalDate nextMonday = today.with(TemporalAdjusters.next(DayOfWeek.MONDAY));
LocalDateTime nextMondayStart = LocalDateTime.of(nextMonday, LocalTime.MIN);
LocalDate nextSunday = nextMonday.plusDays(6);
LocalDateTime nextSundayEnd = LocalDateTime.of(nextSunday, LocalTime.MAX);
queryWrapper.ge(MealOrder::getReserveDate, nextMondayStart);
queryWrapper.lt(MealOrder::getReserveDate, nextSundayEnd);
final var mealOrders = mealOrderService.list(queryWrapper);
if (!mealOrders.isEmpty()) {
for (final var mealOrder : mealOrders) {
......