From bb07147aaa96d1ef4c99e358dbbe7dad160dc62a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:43:23 +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 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 1cfeaa4..dc532e6 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
@@ -37,9 +37,16 @@
*/
public void saveJDOrders(List<JDOrder> jdOrderList) {
for (JDOrder order : jdOrderList) {
- LogHelper.orderInfo("浜笢璁㈠崟:" + order.getOrderId()+"-"+order.getValidCode());
+ LogHelper.orderInfo("浜笢璁㈠崟:" + order.getOrderId() + "-" + order.getValidCode());
if (order.getValidCode() == 15)// 杩囨护鎺夊緟浠樻
continue;
+
+ //闃叉澶氫釜鍟嗗搧鎷嗗崟闂锛岀埇鍙�
+ if (order.getOrderItemList().size() > 1
+ && order.getOrderTime() > System.currentTimeMillis() - 1000 * 60 * 2L) {
+ continue;
+ }
+
try {
jdOrderService.addJDOrder(order);
/**
@@ -47,6 +54,7 @@
*/
String key = "jd-order-" + order.getOrderId();
String result = redisManager.getCommonString(key);
+ // 鍒ゆ柇
JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");
redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
@@ -63,7 +71,7 @@
public void updateSoonOrder() {
if (!Constant.IS_TASK)
return;
- LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
+ LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
long now = System.currentTimeMillis();
JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
--
Gitblit v1.8.0