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 | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 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..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
@@ -1,5 +1,6 @@
package com.yeshi.fanli.job.order.taobao;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -11,13 +12,15 @@
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.RedisKeyEnum;
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.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
/**
@@ -44,22 +47,49 @@
* 缁撴潫椤电爜锛堟瘡椤�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());
+ LogHelper.orderInfo("浼氬憳/娓犻亾鐖彇鍒扮殑璁㈠崟鍙�:" + order.getOrderId());
}
+ addRelationAndSpecialOrder(list);
+ }
+
+ /**
+ * 鎸変粯娆炬椂闂存煡璇�
+ *
+ * @param startTime
+ * @param endTime
+ */
+ public void updateRelationAndSpecialPaidOrder(long startTime, long endTime) {
+ List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoSpecialOrderList(startTime, endTime, 2);
+ List<TaoBaoOrder> list1 = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(startTime, endTime, 2);
+ if (list1 != null && list1.size() > 0)
+ list.addAll(list1);
+ // 鐖彇鍒扮殑璁㈠崟鍙�
+ 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 +107,7 @@
while (its.hasNext()) {
String key = its.next();
List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + key;
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, TaoBaoOrderUtil.getOrderDataHashCode(orders));
// redis鍋氶鐜囬檺鍒�
try {
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
@@ -115,9 +145,12 @@
if (!Constant.IS_TASK)
return;
// 鐖彇杩�20鍒嗛挓鐨勬暟鎹�
- LogHelper.orderInfo("鐖崟:30s鐖彇涓�娆″崟");
- long endTime = System.currentTimeMillis();
+ LogHelper.job("鐖崟:30s鐖彇涓�娆″崟");
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 20L, endTime);
+ updateRelationAndSpecialPaidOrder(endTime - 1000 * 60 * 20L, endTime);
+ updateRelationAndSpecialSettleOrder(endTime - 1000 * 60 * 20L, endTime);
}
// 姣�5鍒嗛挓鏇存柊锛堣繎1澶╂暟鎹級
@@ -125,22 +158,10 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- long endTime = System.currentTimeMillis();
+ LogHelper.job("鐖崟:5min鐖彇涓�娆″崟");
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
+ updateRelationAndSpecialSettleOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
}
-
- // 姣忎釜灏忔椂鏇存柊
- @Scheduled(cron = "0 0 0/1 * * ? ")
- public void doJob3() {
- if (!Constant.IS_TASK)
- return;
- // Calendar calendar = Calendar.getInstance();
- // int h = calendar.get(Calendar.HOUR_OF_DAY);
- // // 姣忎釜灏忔椂鏇存柊100椤垫暟鎹�
- // int fromPage = h * 100;
- // if (fromPage <= 0)
- // fromPage = 11;
- // int toPage = h * 100 + 100;
- }
-
}
--
Gitblit v1.8.0