Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -182,6 +182,7 @@ public class QueryOrdersResponse {
             private String otherCode;
             private String partition;
             private String payChannel;
+            private String payChannelType;
             private String payChannelName;
             /**
              * 订单支付状态   1 未支付 2 已支付 3 已退款 4 已经部分退款 5 完成

order-application-service/src/main/java/cn/freemud/service/impl/ParkingOrderServiceImpl.java

@@ -75,7 +75,7 @@ public class ParkingOrderServiceImpl implements ParkingOrderService {
         request.setStartTimestamp(DateUtil.addMonths(date, -3).getTime()/1000);
         request.setEndTimestamp(date.getTime()/1000);
         request.setOrderClients(Arrays.asList(OrderClientType.PARKING.getIndex()));
-        request.setPayStatuses(Arrays.asList(2,3,4));
+        request.setPayStatuses(Arrays.asList(2));
         request.setBizTypes(Arrays.asList(1,99));
         BaseDownLoadResponse<List<OrderInfoReqs>> listBaseDownLoadResponse = orderDownLoadSdkService.queryOrderByConditions(request, trackingNo);
         if(listBaseDownLoadResponse == null && !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(listBaseDownLoadResponse.getCode())){