Merge branch '20211102-支持查询会员合并后的订单-zhiwei.zha' into qa

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

@@ -687,25 +687,28 @@ public class OrderSdkAdapter {
         for (int i = 0; i < queryOrdersRequest.getSource().length; i++) {
             if ("saas".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.SAAS.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("meals".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.WAI_MEAL.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("saasmall".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.SAASMALL.getIndex());
             }
             else if ("app".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.APP.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("beautiful".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("cashier".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.CASHIER.getIndex());
             }
         }
         orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
-        orderClients.add(OrderClientType.ALIPAY.getIndex());
         orderConditionsReq.setOrderClients(orderClients);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {

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

@@ -4285,23 +4285,22 @@ public class OrderAdapter {
         List<Integer> orderClients = new ArrayList<>();
         if (OrderChannelType.IWC.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.WAI_MEAL.getIndex());
-            //queryOrdersDto.setSource(new String[]{"meals"});
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         } else if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.SAASMALL.getIndex());
-            //queryOrdersDto.setSource(new String[]{"saasmall"});
         } else if (OrderChannelType.APP.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.APP.getIndex());
-            //queryOrdersDto.setSource(new String[]{"app"});
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         } else if (OrderChannelType.BEAUTIFUL.getCode().equals(channelType)) {// 美业新加
             orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         } else if (OrderChannelType.CASHIER.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.CASHIER.getIndex());
         } else {
             orderClients.add(OrderClientType.SAAS.getIndex());
-            //queryOrdersDto.setSource(new String[]{"saas"});
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         }
         orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
-        orderClients.add(OrderClientType.ALIPAY.getIndex());
         queryOrdersDto.setOrderClients(orderClients);
 
         List<Integer> payStatus = new ArrayList<>();