From 712fb305d6f79961e879a2f543107e19d7f9e8a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 11 五月 2020 10:08:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
index cf786b2..736bf42 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
@@ -364,7 +364,7 @@
 					TimeUtil.getGernalTime(end, "yyyy-MM-dd HH:mm:ss"), null, queryType, orderScene);
 			if (dto != null)
 				orderList.addAll(dto.getOrderList());
-			while (dto.isHasNext()) {
+			while (dto!=null&&dto.isHasNext()) {
 				dto = queryNewOrder(TimeUtil.getGernalTime(start, "yyyy-MM-dd HH:mm:ss"),
 						TimeUtil.getGernalTime(end, "yyyy-MM-dd HH:mm:ss"), dto.getPositionIndex(), queryType,
 						orderScene);

--
Gitblit v1.8.0