jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wang.shanshan
f61af1e3 1 parent d9fff53b

add today

Inline Side-by-side
Showing 2 changed files with 9 additions and 1 deletions
...@@ -21,6 +21,7 @@ public class MealOrderDTO { ...@@ -21,6 +21,7 @@ public class MealOrderDTO {
21 @NotNull(message = "status不能为空") 21 @NotNull(message = "status不能为空")
22 private QueryMealOrderStatusEnum status; 22 private QueryMealOrderStatusEnum status;
23 23
24 + private String today;
24 } 25 }
25 26
26 @Data 27 @Data
......
...@@ -25,6 +25,7 @@ import java.time.DayOfWeek; ...@@ -25,6 +25,7 @@ import java.time.DayOfWeek;
25 import java.time.LocalDate; 25 import java.time.LocalDate;
26 import java.time.LocalDateTime; 26 import java.time.LocalDateTime;
27 import java.time.LocalTime; 27 import java.time.LocalTime;
28 +import java.time.ZoneId;
28 import java.util.ArrayList; 29 import java.util.ArrayList;
29 import java.util.Collections; 30 import java.util.Collections;
30 import java.util.Date; 31 import java.util.Date;
...@@ -50,7 +51,13 @@ public class MealOrderServiceImpl implements MealOrderService { ...@@ -50,7 +51,13 @@ public class MealOrderServiceImpl implements MealOrderService {
50 public List<MealOrderVO> queryMealOrders(MealOrderDTO.QueryMealOrderDTO queryMealOrderDTO) { 51 public List<MealOrderVO> queryMealOrders(MealOrderDTO.QueryMealOrderDTO queryMealOrderDTO) {
51 final var loginInfo = LoginContextHolder.getLoginInfo(); 52 final var loginInfo = LoginContextHolder.getLoginInfo();
52 var mealOrderRpcResponses = mealOrderServiceRpcClient.queryMealOrdersByCondition(loginInfo.getEnterpriseId(), List.of(loginInfo.getId()), null, null); 53 var mealOrderRpcResponses = mealOrderServiceRpcClient.queryMealOrdersByCondition(loginInfo.getEnterpriseId(), List.of(loginInfo.getId()), null, null);
53 - final var today = LocalDate.now(); 54 + LocalDate today = LocalDate.now();
55 + if (queryMealOrderDTO.getToday() != null) {
56 + final var todayDate = DateUtil.parseDate(queryMealOrderDTO.getToday());
57 + if (todayDate != null) {
58 + today = todayDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
59 + }
60 + }
54 final var lastWeekStart = today.minusWeeks(1).with(DayOfWeek.MONDAY).atStartOfDay().atZone(DateUtil.CHINA_ZONE).toInstant().toEpochMilli(); 61 final var lastWeekStart = today.minusWeeks(1).with(DayOfWeek.MONDAY).atStartOfDay().atZone(DateUtil.CHINA_ZONE).toInstant().toEpochMilli();
55 final var lastWeekEnd = today.minusWeeks(1).with(DayOfWeek.SUNDAY).atTime(LocalTime.MAX).atZone(DateUtil.CHINA_ZONE).toInstant().toEpochMilli(); 62 final var lastWeekEnd = today.minusWeeks(1).with(DayOfWeek.SUNDAY).atTime(LocalTime.MAX).atZone(DateUtil.CHINA_ZONE).toInstant().toEpochMilli();
56 final var thisWeekStart = today.with(DayOfWeek.MONDAY).atStartOfDay().atZone(DateUtil.CHINA_ZONE).toInstant().toEpochMilli(); 63 final var thisWeekStart = today.with(DayOfWeek.MONDAY).atStartOfDay().atZone(DateUtil.CHINA_ZONE).toInstant().toEpochMilli();
......