聚合订单sdk综合查询接口新增新订单类型集合

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -477,10 +477,6 @@ public class OrderSdkAdapter {
             }
             orderConditionsReq.setOrderStatuses(orderStatusList);
         }
-        //订单类型 1:(店内自取实时-常规堂食) 2:(店内自取预约-预约堂食) 3:(店外快递实时-常规外送) 4:(店外快递预约-预约外送) 5:(店外自取实时-常规自取) 6:(店外自取预约-预约自取)
-        if (CollectionUtils.isNotEmpty(request.getOrderTypes())) {
-            orderConditionsReq.setOrderTypes(request.getOrderTypes().stream().filter(orderType -> orderType != null && !orderType.equals(0)).collect(Collectors.toList()));
-        }
         if (CollectionUtils.isNotEmpty(request.getOrderTypes())) {
             List<Integer> orderTypeList = request.getOrderTypes().stream().filter(orderType -> orderType != null && !orderType.equals(0)).collect(Collectors.toList());
             if (orderTypeList != null && orderTypeList.size() > 0) {
@@ -492,6 +488,12 @@ public class OrderSdkAdapter {
                 orderConditionsReq.setOrderTypes(orderTypes);
             }
         }
+
+        //订单类型 1:(店内自取实时-常规堂食) 2:(店内自取预约-预约堂食) 3:(店外快递实时-常规外送) 4:(店外快递预约-预约外送) 5:(店外自取实时-常规自取) 6:(店外自取预约-预约自取)
+        if (CollectionUtils.isNotEmpty(request.getNewOrderTypes())) {
+            orderConditionsReq.setOrderTypes(request.getNewOrderTypes().stream().filter(orderType -> orderType != null && !orderType.equals(0)).collect(Collectors.toList()));
+        }
+
         orderConditionsReq.setAfterSalesStatus(getOldRefoundStatus(request.getAfterSalesStatus()));
         List<Integer> orderClients = new ArrayList<>();
         if (request.getSource() != null && request.getSource().size() != 0) {

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

@@ -22,7 +22,10 @@ public class QueryOrdersByConditionsRequest extends BaseConfig {
     private List<Integer> discountTypes;
     private String discountId;
     private List<Integer> orderStatuses;
+    //老版订单 订单类型集合
     private List<Integer> orderTypes;
+    //新订单 订单类型集合
+    private List<Integer> newOrderTypes;
     private Integer afterSalesStatus;
     private List<Integer> payStatuses;
     private String thirdOrderCode;