jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
be7f26c4 1 parent 217069f3

fix refund

Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
...@@ -214,7 +214,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -214,7 +214,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
214 queryWrapper.eq(OrderDb::getClientId, request.getClientId()); 214 queryWrapper.eq(OrderDb::getClientId, request.getClientId());
215 queryWrapper.in(OrderDb::getStallId, request.getStallIdsList()); 215 queryWrapper.in(OrderDb::getStallId, request.getStallIdsList());
216 queryWrapper.eq(OrderDb::getStatus, request.getStatusValue()); 216 queryWrapper.eq(OrderDb::getStatus, request.getStatusValue());
217 - queryWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE)); 217 + if (request.getShouldFilterPayStatus()) {
218 + queryWrapper.eq(OrderDb::getPayStatus, request.getPayStatus());
219 + } else {
220 + queryWrapper.in(OrderDb::getPayStatus, List.of(PayStatusEnum.SUCCEED_VALUE, PayStatusEnum.PAY_CANCELED_VALUE));
221 + }
218 queryWrapper.orderByDesc(OrderDb::getCreatedAt); 222 queryWrapper.orderByDesc(OrderDb::getCreatedAt);
219 final var result = orderDbService.page(page, queryWrapper); 223 final var result = orderDbService.page(page, queryWrapper);
220 224
......
...@@ -74,6 +74,7 @@ enum PayStatusEnum { ...@@ -74,6 +74,7 @@ enum PayStatusEnum {
74 SUCCEED = 3; 74 SUCCEED = 3;
75 FAILED = 4; 75 FAILED = 4;
76 PAY_CANCELED = 5; 76 PAY_CANCELED = 5;
77 + REFUND = 6;
77 } 78 }
78 79
79 enum CloseTimeType { 80 enum CloseTimeType {
...@@ -181,8 +182,8 @@ message QueryClientCustomerOrdersByPaginationRpcRequest { ...@@ -181,8 +182,8 @@ message QueryClientCustomerOrdersByPaginationRpcRequest {
181 int32 pageNo = 6; 182 int32 pageNo = 6;
182 int32 pageSize = 7; 183 int32 pageSize = 7;
183 repeated int32 stallIds = 8; 184 repeated int32 stallIds = 8;
184 - bool shouldFilterIsCanceled = 9; 185 + bool shouldFilterPayStatus = 9;
185 - bool isCanceled = 10; 186 + PayStatusEnum payStatus = 10;
186 } 187 }
187 188
188 message OrderCountByStatus { 189 message OrderCountByStatus {
......