野翠山发票订单列表查询新接口

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersRequest.java

@@ -74,5 +74,10 @@ public class QueryOrdersRequest extends BaseConfig {
      */
     private Integer invoiceState;
 
+    /**
+     * 查询订单状态 1 外卖  4 门店自提
+     */
+    private Integer queryOrderType;
+
 
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -491,6 +491,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public QueryOrdersResponse queryOrdersNew(QueryOrdersRequest queryOrdersRequest) {
         OrderUserConditionsReq request = orderSdkAdapter.convent2QueryOrdersRequest(queryOrdersRequest);
         request.setInvoiceState(queryOrdersRequest.getInvoiceState());
+        request.setOrderStatus(Arrays.asList(queryOrdersRequest.getStatus()));
+        request.setOrderType(Arrays.asList(queryOrdersRequest.getQueryOrderType()));
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp<QueryOrderForUserResp> userorderResponse = orderSdkService.queryOrderNew(request, queryOrdersRequest.getTrackingNo());
         return orderSdkAdapter.convent2QueryOrdersResponse(userorderResponse);
     }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1209,6 +1209,7 @@ public class OrderServiceImpl implements Orderservice {
         QueryOrdersDto queryOrdersDto = orderAdapter.convent2QueryOrdersDto(queryOrderDto, userId, channelType);
 
         QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
+        queryOrdersRequest2.setQueryOrderType(queryOrderVo.getQueryOrderType());
         BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
         queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo());
         Integer invoiceState = 1;
@@ -1223,6 +1224,7 @@ public class OrderServiceImpl implements Orderservice {
         if(Objects.equals(QueryOrderStatus.REFUND_BILL.getCode(),queryOrderVo.getQueryOrderStatus())){
             //查询其他
             invoiceState = 3;
+            queryOrdersRequest2.setStatus(new Integer[]{6});
         }
         queryOrdersRequest2.setInvoiceState(invoiceState);
         QueryOrdersResponse queryOrderResponse = orderCenterSdkService.queryOrdersNew(queryOrdersRequest2);