From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
index 8ec0b50..8904f5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
@@ -63,8 +63,7 @@
public void updateSoonOrder() {
if (!Constant.IS_TASK)
return;
-
- LogHelper.orderInfo("寮�濮嬬埇鍙栦含涓滆鍗�");
+ LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
long now = System.currentTimeMillis();
JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
@@ -133,7 +132,7 @@
for (int i = 0; i < 24; i++) {
Date da = new Date(startTime.getTime() + 1000 * 60 * 60L * i);
if (da.getTime() > now.getTime())
- return;
+ break;
List<JDOrder> tempOrderList = getHourOrder(da);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
--
Gitblit v1.8.0