From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 dee78a6..1ac9e2a 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
@@ -11,7 +11,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+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.RedisManager;
@@ -44,22 +44,29 @@
* 缁撴潫椤电爜锛堟瘡椤�100鏉℃暟鎹級
*/
public void updateRelationAndSpecialOrder(long startTime, long endTime) {
- List<TaoBaoOrder> list = TaoKeOrderApiUtil.getSpecialOrder(startTime, endTime);
- List<TaoBaoOrder> list1 = TaoKeOrderApiUtil.getThirdSpecialOrder(startTime, endTime);
- List<TaoBaoOrder> list2 = TaoKeOrderApiUtil.getRelationOrder(startTime, endTime);
- List<TaoBaoOrder> list3 = TaoKeOrderApiUtil.getThirdRelationOrder(startTime, endTime);
+ List<TaoBaoOrder> list =TaoKeOrderApiUtil.getTaoBaoSpecialOrderList (startTime, endTime,1);
+ List<TaoBaoOrder> list1 = TaoKeOrderApiUtil.getTaoBaoRelationOrderList (startTime, endTime,1);
if (list1 != null && list1.size() > 0)
list.addAll(list1);
- if (list2 != null && list2.size() > 0)
- 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);
+ }
+
+ public void updateRelationAndSpecialSettleOrder(long startTime, long endTime) {
+ List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoSpecialOrderList (startTime, endTime,3);
+ List<TaoBaoOrder> list1 = TaoKeOrderApiUtil.getTaoBaoRelationOrderList (startTime, endTime,3);
+ if (list1 != null && list1.size() > 0)
+ list.addAll(list1);
+ // 鐖彇鍒扮殑璁㈠崟鍙�
+ if (list != null)
+ for (TaoBaoOrder order : list) {
+ LogHelper.orderInfo("鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
+ }
addRelationAndSpecialOrder(list);
}
@@ -77,7 +84,7 @@
while (its.hasNext()) {
String key = its.next();
List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + key;
+ String redisKey = "addorderqueue-" + TaoBaoOrderUtil.getOrderDataHashCode(orders);;
// redis鍋氶鐜囬檺鍒�
try {
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
@@ -118,6 +125,7 @@
LogHelper.orderInfo("鐖崟:30s鐖彇涓�娆″崟");
long endTime = System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 20L, endTime);
+ updateRelationAndSpecialSettleOrder(endTime - 1000 * 60 * 20L, endTime);
}
// 姣�5鍒嗛挓鏇存柊锛堣繎1澶╂暟鎹級
@@ -127,6 +135,7 @@
return;
long endTime = System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
+ updateRelationAndSpecialSettleOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
}
// 姣忎釜灏忔椂鏇存柊
--
Gitblit v1.8.0