fix

zhuyifan
Commit b128cd4743cf2d85d69b8f47efd53ac66ddbe95f b128cd47 1 parent 96ef1e7f
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/tianting/infoloop/service/grpc/OrderGrpcService.java
--- a/src/main/java/com/tianting/infoloop/service/grpc/OrderGrpcService.java
View file @b128cd4
+++ b/src/main/java/com/tianting/infoloop/service/grpc/OrderGrpcService.java
View file @b128cd4
@@ -214,7 +214,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
             queryWrapper.eq(OrderDb::getClientId, request.getClientId());
             queryWrapper.in(OrderDb::getStallId, request.getStallIdsList());
             queryWrapper.eq(OrderDb::getStatus, request.getStatusValue());
-            queryWrapper.eq(OrderDb::getPayStatus, PayStatusEnum.SUCCEED_VALUE);
+            queryWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE));
             queryWrapper.orderByDesc(OrderDb::getCreatedAt);
             final var result = orderDbService.page(page, queryWrapper);
@@ -233,7 +233,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
                 queryCountWrapper.eq(OrderDb::getClientId, request.getClientId());
                 queryCountWrapper.eq(OrderDb::getStatus, status.ordinal());
                 queryCountWrapper.in(OrderDb::getStallId, request.getStallIdsList());
-                queryWrapper.eq(OrderDb::getPayStatus, PayStatusEnum.SUCCEED_VALUE);
+                queryCountWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE));
                 final var count = orderDbService.count(queryCountWrapper);
                 if (status.equals(OrderStatusEnum.UNKNOWN_STATUS)) {
                     unknownCount += (int) count;