Merge branch 'feature/mall-20191211-dingkai' into develop

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

@@ -372,6 +372,9 @@ public class OrderSdkAdapter {
             if ("meals".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.WAI_MEAL.getIndex());
             }
+            if ("mall".equals(queryOrdersRequest.getSource()[i])) {
+                orderClients.add(OrderClientType.MALL.getIndex());
+            }
         }
         orderConditionsReq.setOrderClients(orderClients);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -781,10 +781,7 @@ public class OrderAdapter {
                 queryOrdersDto.setRefundStatus(statuses);
             }
         }
-        if (OrderChannelType.IWC.getCode().equals(channelType) || OrderChannelType.MALL.getCode().equals(channelType)) {
-            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode()};
-            queryOrdersDto.setStatus(statuses);
-        }
+
         // 兼容历史版本，如果传参是4 查询拆程4和5
         if (queryOrderDto.getQueryOrderType() != null) {
             if (Objects.equals(queryOrderDto.getQueryOrderType(), OrderType.COLLECT_GOODS.getCode())) {
@@ -793,6 +790,18 @@ public class OrderAdapter {
                 queryOrdersDto.setType(new Integer[]{queryOrderDto.getQueryOrderType()});
             }
         }
+
+        if (OrderChannelType.IWC.getCode().equals(channelType)) {
+            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode()};
+            queryOrdersDto.setStatus(statuses);
+        }
+
+        if (OrderChannelType.MALL.getCode().equals(channelType)) {
+            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode()};
+            queryOrdersDto.setStatus(statuses);
+            queryOrdersDto.setType(new Integer[]{});
+        }
+
         return queryOrdersDto;
     }