From bb133d1e82c337da646e90740b82584b82f9a0e6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 四月 2020 10:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 9407c2f..f4456a2 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
@@ -9,6 +9,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.jd.JDOrderResult;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.exception.jd.JDOrderException;
@@ -17,8 +19,9 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.jd.JDApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@@ -42,9 +45,9 @@
if (order.getValidCode() == 15)// 杩囨护鎺夊緟浠樻
continue;
- //闃叉澶氫釜鍟嗗搧鎷嗗崟闂锛岀埇鍙�
+ // 闃叉澶氫釜鍟嗗搧鎷嗗崟闂锛岀埇鍙�
if (order.getOrderItemList().size() > 1
- && order.getOrderTime() > System.currentTimeMillis() - 1000 * 60 * 2L) {
+ && order.getOrderTime() > System.currentTimeMillis() - 1000 * 60 * 3L) {
continue;
}
@@ -53,12 +56,13 @@
/**
* 鍋氶鐜囬檺鍒�
*/
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.JDOrder, order.getOrderId() + "" );
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.JDOrder, order.getOrderId() + "");
String result = redisManager.getCommonString(key);
// 鍒ゆ柇
-
- JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");
- redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
+ if (StringUtil.isNullOrEmpty(result)) {
+ JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");
+ redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
+ }
} catch (JDOrderException e) {
e.printStackTrace();
}
@@ -68,10 +72,9 @@
/**
* 蹇�熻鍗曟洿鏂帮紙鐖彇鏈皬鏃跺唴鐨勫崟,姣忓垎閽熶竴娆★級
*/
- @Scheduled(cron = "0 0/1 * * * ? ")
- public void updateSoonOrder() {
- if (!Constant.IS_TASK)
- return;
+ @XxlJob("updateJDSoonOrderHandler")
+ public ReturnT<String> startPreDividents(String param) throws Exception {
+
LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
long now = System.currentTimeMillis();
@@ -82,6 +85,8 @@
result = JDApiUtil.getOrderList(1, 200, new Date(now - 1000 * 60 * 60L), JDApiUtil.ORDER_TYPE_CREATETIME);
if (result != null && result.getOrderList() != null)
saveJDOrders(result.getOrderList());
+
+ return ReturnT.SUCCESS;
}
/**
--
Gitblit v1.8.0