Merge remote-tracking branch 'remotes/origin/feature-2020/4/23-1.9.21-ES查询SDK方法升级-海波' into develop

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

@@ -463,7 +463,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setOrderCodes(request.getOrderIds());
         orderConditionsReq.setPartnerId(request.getCompanyId());
         orderConditionsReq.setPageSize(request.getPageSize());
-        orderConditionsReq.setPageNum(request.getPageNumber());
+        orderConditionsReq.setPageNum(request.getPageNumber()>0?request.getPageNumber():0);
         orderConditionsReq.setMobile(request.getPhoneNo());
         orderConditionsReq.setStoreIds(request.getShopIds());
         orderConditionsReq.setPayStatuses(request.getPayStatuses());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -658,8 +658,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public QueryOrdersResponse getOrderListByES(QueryOrdersByConditionsRequest queryOrdersByConditionsRequest) {
         OrderConditionsReq request = orderSdkAdapter.convent2QueryOrdersByConditionsRequest(queryOrdersByConditionsRequest);
         BaseDownLoadResponse<List<OrderInfoReqs>> baseDownLoadResponse = orderDownLoadSdkService.queryOrderByConditions(request, "");
-        if (ObjectUtils.notEqual("100", baseDownLoadResponse.getCode()) || StringUtils.isEmpty(baseDownLoadResponse.getScrollId()) ||
-                CollectionUtils.isEmpty(baseDownLoadResponse.getResult())) {
+
+        if (ObjectUtils.notEqual("100", baseDownLoadResponse.getCode()) || CollectionUtils.isEmpty(baseDownLoadResponse.getResult())) {
             QueryOrdersResponse queryOrdersResponse = new QueryOrdersResponse();
             queryOrdersResponse.setErrcode(Integer.parseInt(baseDownLoadResponse.getCode()));
             QueryOrdersResponse.DataBean dataBean = new QueryOrdersResponse.DataBean();
@@ -669,6 +669,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             queryOrdersResponse.setData(dataBean);
             return queryOrdersResponse;
         }
+
+        if(request.getPageNum()>0){
+            return orderSdkAdapter.convent2OrdersResponseByES(baseDownLoadResponse);
+        }
+
         List<OrderInfoReqs> list = new ArrayList<>();
         list.addAll(baseDownLoadResponse.getResult());
         if (baseDownLoadResponse.getTotalNum() > queryOrdersByConditionsRequest.getPageSize()) {