es查询新老兼容

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3799,18 +3799,20 @@ public class OrderAdapter {
 
         List<Integer> orderClients = new ArrayList<>();
         if(OrderChannelType.IWC.getCode().equals(channelType)) {
-            orderClients.add(com.freemud.sdk.api.assortment.order.enums.OrderSourceType.MEAL.getClientType());
+            orderClients.add(OrderClientType.WAI_MEAL.getIndex());
             //queryOrdersDto.setSource(new String[]{"meals"});
         } else if(OrderChannelType.SAASMALL.getCode().equals(channelType)) {
-            orderClients.add(com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getClientType());
+            orderClients.add(OrderClientType.SAASMALL.getIndex());
             //queryOrdersDto.setSource(new String[]{"saasmall"});
         } else if(OrderChannelType.APP.getCode().equals(channelType)){
-            orderClients.add(com.freemud.sdk.api.assortment.order.enums.OrderSourceType.APP.getClientType());
+            orderClients.add(OrderClientType.APP.getIndex());
             //queryOrdersDto.setSource(new String[]{"app"});
         } else {
-            orderClients.add(com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAAS.getClientType());
+            orderClients.add(OrderClientType.SAAS.getIndex());
             //queryOrdersDto.setSource(new String[]{"saas"});
         }
+        orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
+        orderClients.add(OrderClientType.ALIPAY.getIndex());
         queryOrdersDto.setOrderClients(orderClients);
 
         List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
@@ -3904,6 +3906,35 @@ public class OrderAdapter {
         //商品订单和卖券订单
         queryOrdersDto.setBizTypes(Arrays.asList(1,6));
 
+        // 新老兼容
+        if(queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()){
+            List<Integer> orderStatus = new ArrayList<>();
+            for(Integer orderStatuses : queryOrdersDto.getOrderStatuses()){
+                orderStatus.add(orderSdkAdapter.getNewOrderStatus(orderStatuses));
+            }
+        }
+
+        if(queryOrdersDto.getOrderTypes() != null && !queryOrdersDto.getOrderTypes().isEmpty()){
+            List<Integer> orderType = new ArrayList<>();
+            for(Integer type : queryOrdersDto.getOrderTypes()){
+                //订单服务订单类型 1=外卖 4=自提，5=堂食
+                //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
+                if (type.intValue() == 1) {
+                    orderType.add(3);
+                    orderType.add(4);
+                }
+                if (type.intValue() == 4) {
+                    orderType.add(5);
+                    orderType.add(6);
+                }
+                if (type.intValue() == 5) {
+                    orderType.add(1);
+                    orderType.add(2);
+                }
+            }
+        }
+
+
         return queryOrdersDto;
     }