wangyingyang

fix

......@@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
public class ClientOrderController {
private final OrderService orderService;
@SaIgnore
@ApiOperation(value = "院区端分页获取用户订单")
@PostMapping("/client/orders/pagination")
@ResponseStatus(HttpStatus.OK)
......
......@@ -55,6 +55,7 @@ public class OrderServiceRpcClient {
private final ClientCustomerOrderServiceRpcGrpc.ClientCustomerOrderServiceRpcBlockingStub orderServiceRpcBlockingStub;
private final MenuServiceRpcClient menuServiceRpcClient;
private final SkuServiceRpcClient skuServiceRpcClient;
private final OperatorServiceRpcClient operatorServiceRpcClient;
public List<SingleClientCustomerOrderRpcResponse> getOrdersByCustomerId(Integer customerId) {
return orderServiceRpcBlockingStub.getClientCustomerOrdersByCustomerId(
......@@ -205,6 +206,8 @@ public class OrderServiceRpcClient {
public QueryClientCustomerOrdersByPaginationRpcResponse queryClientCustomerOrdersByPagination(
QueryOrderByPaginationDto queryOrderDto) {
final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
final var operator = operatorServiceRpcClient.getCOperatorById(operatorLoginInfo.getId());
final var request = QueryClientCustomerOrdersByPaginationRpcRequest.newBuilder()
.setKeyword(queryOrderDto.getKeyword())
.setPageNo(queryOrderDto.getPn())
......@@ -212,6 +215,7 @@ public class OrderServiceRpcClient {
.setStatus(queryOrderDto.getStatus())
.setEnterpriseId(queryOrderDto.getEnterpriseId())
.setClientId(queryOrderDto.getClientId())
.addAllStallIds(List.of(operator.getStallId()))
.build();
return orderServiceRpcBlockingStub.queryClientCustomerOrdersByPagination(request);
}
......
......@@ -159,6 +159,7 @@ message QueryClientCustomerOrdersByPaginationRpcRequest {
int32 enterpriseId = 4;
int32 pageNo = 5;
int32 pageSize = 6;
repeated int32 stallIds = 7;
}
message OrderCountByStatus {
......