From cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 10:46:32 +0800
Subject: [PATCH] 订单商品类型处理
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java
index 9e99d38..3de8384 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java
@@ -1,8 +1,5 @@
package com.yeshi.fanli.job;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -57,6 +54,12 @@
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);
}
@@ -64,11 +67,7 @@
try {
taoBaoOrderService.addTaoBaoOrderList(orderList);
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
try {
@@ -89,7 +88,13 @@
}
- CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);
+ LogHelper.orderInfo("娣诲姞鍒伴槦鍒�:" + key);
+ if (orders != null && orders.size() > 0 && System.currentTimeMillis()
+ - TimeUtil.convertToTimeTemp(orders.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") < 1000
+ * 60 * 10L)// 10鍒嗛挓鍐呬骇鐢熺殑鍗曚綔涓烘柊璁㈠崟澶勭悊
+ CMQManager.getInstance().addTaoBaoNewOrderMsg(key);
+ else
+ CMQManager.getInstance().addTaoBaoOrderMsg(key);
try {
// 20鍒嗛挓鍐呬笉鍐嶅鐞�
@@ -100,11 +105,7 @@
}
}
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
@@ -114,6 +115,7 @@
if (!Constant.IS_TASK)
return;
// 鐖彇杩�20鍒嗛挓鐨勬暟鎹�
+ LogHelper.orderInfo("鐖崟:30s鐖彇涓�娆″崟");
long endTime = System.currentTimeMillis();
updateRelationAndSpecialOrder(endTime - 1000 * 60 * 20L, endTime);
}
@@ -132,13 +134,13 @@
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;
+ // 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