fix

zhuyifan
Commit 96ef1e7f3509328595dadd16cd552f23134479cd 96ef1e7f 1 parent 284e62d1
Showing 1 changed file with 6 additions and 7 deletions
src/main/java/com/tianting/infoloop/service/grpc/OrderGrpcService.java
--- a/src/main/java/com/tianting/infoloop/service/grpc/OrderGrpcService.java
View file @96ef1e7
+++ b/src/main/java/com/tianting/infoloop/service/grpc/OrderGrpcService.java
View file @96ef1e7
@@ -233,20 +233,20 @@ 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);
                 final var count = orderDbService.count(queryCountWrapper);
                 if (status.equals(OrderStatusEnum.UNKNOWN_STATUS)) {
-                    unknownCount += count;
+                    unknownCount += (int) count;
                 } else if (status.equals(OrderStatusEnum.TO_PREPARE)) {
-                    toPrepareCount += count;
+                    toPrepareCount += (int) count;
                 } else if (status.equals(OrderStatusEnum.PREPARING)) {
-                    preparingCount += count;
+                    preparingCount += (int) count;
                 } else if (status.equals(OrderStatusEnum.PARTIAL_SERVED) || status.equals(OrderStatusEnum.ALL_SERVED)) {
-                    allServedCount += count;
+                    allServedCount += (int) count;
                 } else {
-                    canceledCount += count;
+                    canceledCount += (int) count;
                 }
             }
-
             builder.setCountByStatus(OrderCountByStatus.newBuilder()
                     .setUnknownCount(unknownCount)
                     .setToPrepareCount(toPrepareCount)
@@ -257,7 +257,6 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
             builder.setTotal(result.getTotal());
             builder.setPages(result.getPages());
             if (!result.getRecords().isEmpty()) {
-//        builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(result.getRecords(), SingleClientCustomerOrderRpcResponse.class));
                 builder.addAllResponses(DbToProtoUtil.orderDbListToProtoList(result.getRecords()));
             }
         } catch (final Exception e) {