From 449e58e820a51054b9f98ae48e4412dc18f036b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 14:25:47 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java
index db43953..3de8384 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java
@@ -16,6 +16,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@@ -53,6 +54,12 @@
list.addAll(list2);
if (list3 != null && list3.size() > 0)
list.addAll(list3);
+ // 鐖彇鍒扮殑璁㈠崟鍙�
+ if (list != null)
+ for (TaoBaoOrder order : list) {
+ LogHelper.orderInfo("鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
+ }
+
addRelationAndSpecialOrder(list);
}
@@ -81,7 +88,13 @@
}
- CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);
+ LogHelper.orderInfo("娣诲姞鍒伴槦鍒�:" + key);
+ if (orders != null && orders.size() > 0 && System.currentTimeMillis()
+ - TimeUtil.convertToTimeTemp(orders.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") < 1000
+ * 60 * 10L)// 10鍒嗛挓鍐呬骇鐢熺殑鍗曚綔涓烘柊璁㈠崟澶勭悊
+ CMQManager.getInstance().addTaoBaoNewOrderMsg(key);
+ else
+ CMQManager.getInstance().addTaoBaoOrderMsg(key);
try {
// 20鍒嗛挓鍐呬笉鍐嶅鐞�
@@ -102,6 +115,7 @@
if (!Constant.IS_TASK)
return;
// 鐖彇杩�20鍒嗛挓鐨勬暟鎹�
+ LogHelper.orderInfo("鐖崟:30s鐖彇涓�娆″崟");
long endTime = System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 20L, endTime);
}
--
Gitblit v1.8.0