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

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

@@ -181,6 +181,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/OrderServiceImpl.java

@@ -2905,6 +2905,7 @@ 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());