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

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

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

@@ -2905,7 +2905,6 @@ public class OrderServiceImpl implements Orderservice {
             Date startDate = DateUtil.convert2Date("2020-08-01 00:00:00", DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
             orderConditionsReq.setStartTimestamp(startDate.getTime()/1000);
             orderConditionsReq.setEndTimestamp(new Date().getTime()/1000);
-            orderConditionsReq.setPayStatuses(Arrays.asList(2));
             BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq,LogTreadLocal.getTrackingNo());
             if (!String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoReqs.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode());

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

@@ -75,8 +75,8 @@ public class ParkingOrderServiceImpl implements ParkingOrderService {
         request.setStartTimestamp(DateUtil.addMonths(date, -2).getTime() / 1000);
         request.setEndTimestamp(date.getTime() / 1000);
         request.setOrderClients(Arrays.asList(OrderClientType.PARKING.getIndex()));
-        request.setPayStatuses(Arrays.asList(2, 3, 4));
-        request.setBizTypes(Arrays.asList(1, 99));
+        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())
                 && listBaseDownLoadResponse.getResult().size() > 0) {