fix

zhuyifan
Commit 3875fde7cb1fe71088091d8f3b248f470e650b00 3875fde7 1 parent f84ceef1
Showing 1 changed file with 6 additions and 6 deletions
src/main/java/com/tianting/infoloop/service/grpc/MealOrderGrpcService.java
--- a/src/main/java/com/tianting/infoloop/service/grpc/MealOrderGrpcService.java
View file @3875fde
+++ b/src/main/java/com/tianting/infoloop/service/grpc/MealOrderGrpcService.java
View file @3875fde
@@ -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));
+            LocalDate nextMonday = today.with(TemporalAdjusters.next(DayOfWeek.MONDAY));
-            LocalDateTime thisMondayStart = LocalDateTime.of(thisMonday, LocalTime.MIN);
+            LocalDateTime nextMondayStart = LocalDateTime.of(nextMonday, LocalTime.MIN);
-            LocalDate thisSunday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+            LocalDate nextSunday = nextMonday.plusDays(6);
-            LocalDateTime thisSundayEnd = LocalDateTime.of(thisSunday, LocalTime.MAX);
+            LocalDateTime nextSundayEnd = LocalDateTime.of(nextSunday, LocalTime.MAX);
-            queryWrapper.ge(MealOrder::getReserveDate, thisMondayStart);
+            queryWrapper.ge(MealOrder::getReserveDate, nextMondayStart);
-            queryWrapper.lt(MealOrder::getReserveDate, thisSundayEnd);
+            queryWrapper.lt(MealOrder::getReserveDate, nextSundayEnd);
             final var mealOrders = mealOrderService.list(queryWrapper);
             if (!mealOrders.isEmpty()) {
                 for (final var mealOrder : mealOrders) {