wangyingyang

fix refund

......@@ -214,7 +214,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
queryWrapper.eq(OrderDb::getClientId, request.getClientId());
queryWrapper.in(OrderDb::getStallId, request.getStallIdsList());
queryWrapper.eq(OrderDb::getStatus, request.getStatusValue());
if (request.getShouldFilterPayStatus()) {
queryWrapper.eq(OrderDb::getPayStatus, request.getPayStatus());
} else {
queryWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE));
}
queryWrapper.orderByDesc(OrderDb::getCreatedAt);
final var result = orderDbService.page(page, queryWrapper);
......
......@@ -74,6 +74,7 @@ enum PayStatusEnum {
SUCCEED = 3;
FAILED = 4;
PAY_CANCELED = 5;
REFUND = 6;
}
enum CloseTimeType {
......@@ -181,8 +182,8 @@ message QueryClientCustomerOrdersByPaginationRpcRequest {
int32 pageNo = 6;
int32 pageSize = 7;
repeated int32 stallIds = 8;
bool shouldFilterIsCanceled = 9;
bool isCanceled = 10;
bool shouldFilterPayStatus = 9;
PayStatusEnum payStatus = 10;
}
message OrderCountByStatus {
......