From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 b8b1dd1..54faf69 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
@@ -14,12 +14,11 @@
import com.yeshi.fanli.exception.jd.JDOrderException;
import com.yeshi.fanli.service.inter.jd.JDOrderService;
import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
import com.yeshi.fanli.util.jd.JDApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
-@Component
+//@Component
public class UpdateJDOrderJob {
@Resource
@@ -34,7 +33,9 @@
* @param jdOrderList
*/
public void saveJDOrders(List<JDOrder> jdOrderList) {
- for (JDOrder order : jdOrderList)
+ for (JDOrder order : jdOrderList) {
+ if (order.getValidCode() == 15)// 杩囨护鎺変唬浠樻鐘舵��
+ continue;
try {
jdOrderService.addJDOrder(order);
/**
@@ -42,13 +43,13 @@
*/
String key = "jd-order-" + order.getOrderId();
String result = redisManager.getCommonString(key);
- if (!StringUtil.isNullOrEmpty(result))
- continue;
+
JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");
redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
} catch (JDOrderException e) {
e.printStackTrace();
}
+ }
}
/**
@@ -56,7 +57,15 @@
*/
@Scheduled(cron = "0 0/1 * * * ? ")
public void updateSoonOrder() {
- JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(), JDApiUtil.ORDER_TYPE_CREATETIME);
+ // if (!Constant.IS_TASK)
+ // return;
+ long now = System.currentTimeMillis();
+
+ JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
+ if (result != null && result.getOrderList() != null)
+ saveJDOrders(result.getOrderList());
+ // 鏌ヨ涓婁釜灏忔椂鐨�
+ result = JDApiUtil.getOrderList(1, 200, new Date(now - 1000 * 60 * 60 * 24L), JDApiUtil.ORDER_TYPE_CREATETIME);
if (result != null && result.getOrderList() != null)
saveJDOrders(result.getOrderList());
}
@@ -66,14 +75,19 @@
*/
@Scheduled(cron = "0 0/10 * * * ? ")
public void updateUpdateOrder() {
+ // if (!Constant.IS_TASK)
+ // return;
List<JDOrder> jdOrderList = new ArrayList<>();
int pageSize = 200;
int page = 1;
JDOrderResult result = JDApiUtil.getOrderList(page++, pageSize, new Date(), JDApiUtil.ORDER_TYPE_UPDATETIME);
- jdOrderList.addAll(result.getOrderList());
- while (result.isHasMore()) {
- result = JDApiUtil.getOrderList(page++, pageSize, new Date(), JDApiUtil.ORDER_TYPE_UPDATETIME);
+ if (result != null) {
jdOrderList.addAll(result.getOrderList());
+ while (result != null && result.isHasMore()) {
+ result = JDApiUtil.getOrderList(page++, pageSize, new Date(), JDApiUtil.ORDER_TYPE_UPDATETIME);
+ if (result != null)
+ jdOrderList.addAll(result.getOrderList());
+ }
}
saveJDOrders(jdOrderList);
}
--
Gitblit v1.8.0