From 011d53f9f3d08af8cd622585ce40eb880f313aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 25 九月 2019 12:02:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..e767d46 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
@@ -44,8 +44,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 +56,10 @@
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 +84,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))) {
@@ -133,6 +134,7 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
+ LogHelper.orderInfo("鐖崟:5min鐖彇涓�娆″崟");
long endTime = System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
updateRelationAndSpecialSettleOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
--
Gitblit v1.8.0