From 5737c1229b265456415a20c71f12229b941a4629 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 27 九月 2019 00:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 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 1ac9e2a..df8ef10 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;
@@ -18,6 +19,7 @@
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,8 +46,8 @@
* 缁撴潫椤电爜锛堟瘡椤�100鏉℃暟鎹級
*/
public void updateRelationAndSpecialOrder(long startTime, long endTime) {
- List<TaoBaoOrder> list =TaoKeOrderApiUtil.getTaoBaoSpecialOrderList (startTime, endTime,1);
- List<TaoBaoOrder> list1 = TaoKeOrderApiUtil.getTaoBaoRelationOrderList (startTime, endTime,1);
+ 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);
// 鐖彇鍒扮殑璁㈠崟鍙�
@@ -56,10 +58,30 @@
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);
+ 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);
// 鐖彇鍒扮殑璁㈠崟鍙�
@@ -84,7 +106,8 @@
while (its.hasNext()) {
String key = its.next();
List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + TaoBaoOrderUtil.getOrderDataHashCode(orders);;
+ String redisKey = "addorderqueue-" + TaoBaoOrderUtil.getOrderDataHashCode(orders);
+ ;
// redis鍋氶鐜囬檺鍒�
try {
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
@@ -123,8 +146,10 @@
return;
// 鐖彇杩�20鍒嗛挓鐨勬暟鎹�
LogHelper.orderInfo("鐖崟:30s鐖彇涓�娆″崟");
- long endTime = System.currentTimeMillis();
+ 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);
}
@@ -133,23 +158,10 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- long endTime = System.currentTimeMillis();
+ LogHelper.orderInfo("鐖崟: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