zhuyifan

refactor(settlement):优化订单查询逻辑

- 移除了今日开始时间戳的计算逻辑- 简化了订单时间过滤条件
- 提高了代码可读性和维护性
...@@ -63,7 +63,6 @@ import java.math.BigDecimal; ...@@ -63,7 +63,6 @@ import java.math.BigDecimal;
63 import java.math.RoundingMode; 63 import java.math.RoundingMode;
64 import java.time.LocalDate; 64 import java.time.LocalDate;
65 import java.time.LocalDateTime; 65 import java.time.LocalDateTime;
66 -import java.time.ZoneId;
67 import java.time.temporal.ChronoUnit; 66 import java.time.temporal.ChronoUnit;
68 import java.util.ArrayList; 67 import java.util.ArrayList;
69 import java.util.Collections; 68 import java.util.Collections;
...@@ -1139,21 +1138,8 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -1139,21 +1138,8 @@ public class SettlementServiceImpl implements SettlementService {
1139 // 查询订单列表 1138 // 查询订单列表
1140 final var queryClientCustomerOrdersByConditionRpcResponse = orderServiceRpcClient.queryClientCustomerOrdersByCondition(queryOrderDto); 1139 final var queryClientCustomerOrdersByConditionRpcResponse = orderServiceRpcClient.queryClientCustomerOrdersByCondition(queryOrderDto);
1141 1140
1142 - // 今天开始时间的时间戳(毫秒) 1141 +
1143 - final long todayStartTimestamp = LocalDate.now().atStartOfDay() 1142 + final var orderList = queryClientCustomerOrdersByConditionRpcResponse.getResponsesList();
1144 - .atZone(ZoneId.systemDefault())
1145 - .toInstant()
1146 - .toEpochMilli();
1147 -
1148 - final var orderList = queryClientCustomerOrdersByConditionRpcResponse.getResponsesList()
1149 - .stream()
1150 - .filter(e -> {
1151 - boolean payStatusMatch = e.getPayStatus() == PayStatusEnum.SUCCEED|| e.getPayStatus() == PayStatusEnum.PAY_CANCELED;
1152 - // 过滤时间:只查询今天和以后的订单
1153 - boolean timeMatch = e.getMealTime() >= todayStartTimestamp;
1154 - return payStatusMatch && timeMatch;
1155 - })
1156 - .toList();
1157 if (orderList.isEmpty()) { 1143 if (orderList.isEmpty()) {
1158 log.warn("未查询到订单数据,enterpriseId: {}", enterpriseId); 1144 log.warn("未查询到订单数据,enterpriseId: {}", enterpriseId);
1159 return createEmptyExcelBySeparateMeal(); 1145 return createEmptyExcelBySeparateMeal();
......