jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
d80716a7 1 parent 25c8b5e5

院区端订单只查今天和以后的

Inline Side-by-side
Showing 1 changed file with 7 additions and 0 deletions
...@@ -83,6 +83,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -83,6 +83,7 @@ import lombok.extern.slf4j.Slf4j;
83 import org.springframework.beans.factory.annotation.Autowired; 83 import org.springframework.beans.factory.annotation.Autowired;
84 import org.springframework.stereotype.Service; 84 import org.springframework.stereotype.Service;
85 85
86 +import java.time.LocalDate;
86 import java.util.ArrayList; 87 import java.util.ArrayList;
87 import java.util.List; 88 import java.util.List;
88 import java.util.function.Function; 89 import java.util.function.Function;
...@@ -219,6 +220,8 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -219,6 +220,8 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
219 } else { 220 } else {
220 queryWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE)); 221 queryWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE));
221 } 222 }
223 + // 只查询今天和以后的订单
224 + queryWrapper.ge(OrderDb::getMealTime, LocalDate.now().atStartOfDay());
222 queryWrapper.orderByDesc(OrderDb::getCreatedAt); 225 queryWrapper.orderByDesc(OrderDb::getCreatedAt);
223 final var result = orderDbService.page(page, queryWrapper); 226 final var result = orderDbService.page(page, queryWrapper);
224 227
...@@ -238,6 +241,8 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -238,6 +241,8 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
238 queryCountWrapper.eq(OrderDb::getStatus, status.ordinal()); 241 queryCountWrapper.eq(OrderDb::getStatus, status.ordinal());
239 queryCountWrapper.in(OrderDb::getStallId, request.getStallIdsList()); 242 queryCountWrapper.in(OrderDb::getStallId, request.getStallIdsList());
240 queryCountWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE)); 243 queryCountWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE));
244 + // 只查询今天和以后的订单
245 + queryCountWrapper.ge(OrderDb::getMealTime, LocalDate.now().atStartOfDay());
241 final var count = orderDbService.count(queryCountWrapper); 246 final var count = orderDbService.count(queryCountWrapper);
242 if (status.equals(OrderStatusEnum.UNKNOWN_STATUS)) { 247 if (status.equals(OrderStatusEnum.UNKNOWN_STATUS)) {
243 unknownCount += (int) count; 248 unknownCount += (int) count;
...@@ -259,6 +264,8 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -259,6 +264,8 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
259 queryRefundCountWrapper.eq(OrderDb::getClientId, request.getClientId()); 264 queryRefundCountWrapper.eq(OrderDb::getClientId, request.getClientId());
260 queryRefundCountWrapper.in(OrderDb::getStallId, request.getStallIdsList()); 265 queryRefundCountWrapper.in(OrderDb::getStallId, request.getStallIdsList());
261 queryRefundCountWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.REFUND_VALUE)); 266 queryRefundCountWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.REFUND_VALUE));
267 + // 只查询今天和以后的订单
268 + queryRefundCountWrapper.ge(OrderDb::getMealTime, LocalDate.now().atStartOfDay());
262 final var refundCount = orderDbService.count(queryRefundCountWrapper); 269 final var refundCount = orderDbService.count(queryRefundCountWrapper);
263 builder.setCountByStatus(OrderCountByStatus.newBuilder() 270 builder.setCountByStatus(OrderCountByStatus.newBuilder()
264 .setUnknownCount(unknownCount) 271 .setUnknownCount(unknownCount)
......