zhuyifan

fix

...@@ -49,6 +49,7 @@ import com.infoloop.tianting.clientcustomerorderservice.OrderCountByStatus; ...@@ -49,6 +49,7 @@ import com.infoloop.tianting.clientcustomerorderservice.OrderCountByStatus;
49 import com.infoloop.tianting.clientcustomerorderservice.OrderOperationRecord; 49 import com.infoloop.tianting.clientcustomerorderservice.OrderOperationRecord;
50 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum; 50 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
51 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum; 51 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
52 +import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
52 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcRequest; 53 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcRequest;
53 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcResponse; 54 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcResponse;
54 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByPaginationRpcRequest; 55 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByPaginationRpcRequest;
...@@ -213,6 +214,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -213,6 +214,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
213 queryWrapper.eq(OrderDb::getClientId, request.getClientId()); 214 queryWrapper.eq(OrderDb::getClientId, request.getClientId());
214 queryWrapper.in(OrderDb::getStallId, request.getStallIdsList()); 215 queryWrapper.in(OrderDb::getStallId, request.getStallIdsList());
215 queryWrapper.eq(OrderDb::getStatus, request.getStatusValue()); 216 queryWrapper.eq(OrderDb::getStatus, request.getStatusValue());
217 + queryWrapper.eq(OrderDb::getPayStatus, PayStatusEnum.SUCCEED_VALUE);
216 queryWrapper.orderByDesc(OrderDb::getCreatedAt); 218 queryWrapper.orderByDesc(OrderDb::getCreatedAt);
217 final var result = orderDbService.page(page, queryWrapper); 219 final var result = orderDbService.page(page, queryWrapper);
218 220
......