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

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

@@ -68,4 +68,11 @@ public class QueryOrdersRequest extends BaseConfig {
      * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
      */
     private Integer marketingType;
+
+    /**
+     * 1:可开票，2:已开票,3:其他(不可开票)
+     */
+    private Integer invoiceState;
+
+
 }

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

@@ -490,6 +490,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public QueryOrdersResponse queryOrdersNew(QueryOrdersRequest queryOrdersRequest) {
         OrderUserConditionsReq request = orderSdkAdapter.convent2QueryOrdersRequest(queryOrdersRequest);
+        request.setInvoiceState(queryOrdersRequest.getInvoiceState());
         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

@@ -1211,10 +1211,20 @@ public class OrderServiceImpl implements Orderservice {
         QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
         BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
         queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo());
-        queryOrdersRequest2.setNeedInvoice(queryOrderVo.getNeedInvoice());
+        Integer invoiceState = 1;
+        if(Objects.equals(queryOrderVo.getNeedInvoice(),false)){
+            //查询可开票，支付状态为已支付
+            invoiceState = 1;
+            queryOrdersRequest2.setPayStatus(new Integer[]{2});
+        }else if(Objects.equals(queryOrderVo.getNeedInvoice(),true)){
+            //查询已开票
+            invoiceState = 2;
+        }
         if(Objects.equals(QueryOrderStatus.REFUND_BILL.getCode(),queryOrderVo.getQueryOrderStatus())){
-            queryOrdersRequest2.setPayStatus(new Integer[]{3});//发票其他订单查询已退款
+            //查询其他
+            invoiceState = 3;
         }
+        queryOrdersRequest2.setInvoiceState(invoiceState);
         QueryOrdersResponse queryOrderResponse = orderCenterSdkService.queryOrdersNew(queryOrdersRequest2);
 
         if (queryOrderResponse == null || !RESPONSE_SUCCESS_CODE.equals(queryOrderResponse.getErrcode())) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderUserConditionsReq.java

@@ -65,4 +65,9 @@ public class OrderUserConditionsReq {
      */
     private Integer marketingType;
 
+    /**
+     * 1:可开票，2:已开票,3:其他(不可开票)
+     */
+    private Integer invoiceState;
+
 }