From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java
index df8ef10..e8e65d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.util.CMQManager;
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;
@@ -53,7 +54,7 @@
// 鐖彇鍒扮殑璁㈠崟鍙�
if (list != null)
for (TaoBaoOrder order : list) {
- LogHelper.orderInfo("鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.orderInfo("浼氬憳/娓犻亾鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
}
addRelationAndSpecialOrder(list);
@@ -73,7 +74,7 @@
// 鐖彇鍒扮殑璁㈠崟鍙�
if (list != null)
for (TaoBaoOrder order : list) {
- LogHelper.orderInfo("鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.orderInfo("浼氬憳/娓犻亾鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
}
addRelationAndSpecialOrder(list);
@@ -87,7 +88,7 @@
// 鐖彇鍒扮殑璁㈠崟鍙�
if (list != null)
for (TaoBaoOrder order : list) {
- LogHelper.orderInfo("鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.orderInfo("浼氬憳/娓犻亾鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
}
addRelationAndSpecialOrder(list);
}
@@ -106,8 +107,7 @@
while (its.hasNext()) {
String key = its.next();
List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + TaoBaoOrderUtil.getOrderDataHashCode(orders);
- ;
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, TaoBaoOrderUtil.getOrderDataHashCode(orders));
// redis鍋氶鐜囬檺鍒�
try {
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
@@ -145,7 +145,7 @@
if (!Constant.IS_TASK)
return;
// 鐖彇杩�20鍒嗛挓鐨勬暟鎹�
- LogHelper.orderInfo("鐖崟:30s鐖彇涓�娆″崟");
+ LogHelper.job("鐖崟:30s鐖彇涓�娆″崟");
Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 20L, endTime);
@@ -158,7 +158,7 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- LogHelper.orderInfo("鐖崟:5min鐖彇涓�娆″崟");
+ LogHelper.job("鐖崟:5min鐖彇涓�娆″崟");
Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
--
Gitblit v1.8.0