From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +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/UpdateOrderJob.java | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
index 977c797..b58b422 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
@@ -89,11 +89,13 @@
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -111,11 +113,13 @@
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -302,7 +306,6 @@
taoBaoOrderService.addTaoBaoOrderList(orderList);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
-
}
try {
@@ -363,7 +366,6 @@
if (!Constant.IS_TASK)
return;
long endTime = System.currentTimeMillis() - 1000 * 60;
- ;
updateOrder(endTime - 1000 * 60 * 20L, endTime);
}
@@ -372,8 +374,14 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- doTaoBaoWeiQuan();
+ LogHelper.error("澶勭悊杩斿埄鍒拌处鍓嶇疆");
+ try {
+ doTaoBaoWeiQuanOrder(2);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ LogHelper.error("寮�濮嬪鐞嗚繑鍒�");
orderProcessService.fanli();
}
@@ -385,34 +393,57 @@
orderProcessService.fanliInvaiteAndShare();
}
- // 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
- // 30鍒嗛挓涓�娆�
- @Scheduled(cron = "0 0/30 * * * ? ")
- public void doTaoBaoWeiQuan() {
- if (!Constant.IS_TASK)
- return;
- // 鏂扮増缁存潈璁㈠崟澶勭悊
- for (int i = 0; i < 60; i++) {
+ private void doTaoBaoWeiQuanOrder(int day) {
+
+ for (int i = 0; i < day; i++) {
List<TaoBaoWeiQuanOrder> orderList = new ArrayList<>();
+
+ // 鎸夌収缁存潈鍙戣捣鏃堕棿鏌ヨ
WeiQuanOrderResult result = TaoKeOrderApiUtil
.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, false);
+ "yyyy-MM-dd")), 1, 1, false);
orderList.addAll(result.orderList);
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, true);
+ orderList.addAll(result.orderList);
+
+ result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, false);
+ orderList.addAll(result.orderList);
+
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, true);
+ orderList.addAll(result.orderList);
+
+ /**
+ * 鎸夌収缁存潈瀹屾垚鏃堕棿鏌ヨ
+ */
result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, true);
+ "yyyy-MM-dd")), 3, 1, false);
+ orderList.addAll(result.orderList);
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 3, 1, true);
orderList.addAll(result.orderList);
result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, false);
+ "yyyy-MM-dd")), 3, 1, false);
orderList.addAll(result.orderList);
+ // 绗笁鏂�
result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, true);
+ "yyyy-MM-dd")), 3, 1, true);
orderList.addAll(result.orderList);
for (TaoBaoWeiQuanOrder order : orderList)
@@ -420,6 +451,16 @@
// 澶勭悊缁存潈璁㈠崟
orderProcessService.weiQuanOrder(orderList);
}
+
+ }
+
+ // 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
+ // 30鍒嗛挓涓�娆�
+ @Scheduled(cron = "0 0/30 * * * ? ")
+ public void doTaoBaoWeiQuan() {
+ if (!Constant.IS_TASK)
+ return;
+ doTaoBaoWeiQuanOrder(5);
}
// 姣�6涓皬鏃舵墽琛屼竴娆�
@@ -474,7 +515,7 @@
}
/**
- * 13鍒嗛挓鏇存柊鏈�杩�13鍒嗛挓鐨勭粨绠楁暟鎹�
+ * 13鍒嗛挓鏇存柊鏈�杩�2灏忔椂鐨勭粨绠楁暟鎹�
*/
@Scheduled(cron = "0 0/13 * * * ? ")
public void doSettleOrdersToday() {
@@ -482,8 +523,8 @@
return;
// 澶勭悊3-15澶╁墠鐨勮鍗曪紝姣忓ぉ璺戜竴娆�
Calendar ca = Calendar.getInstance();
- long startTime = ca.getTimeInMillis() - 1000 * 60 * 5L - 1000 * 60 * 13L;
- long endTime = startTime + 1000 * 60 * 13L;
+ long startTime = ca.getTimeInMillis() - 1000 * 60 * 5L - 1000 * 60 * 60 * 2L;
+ long endTime = startTime + 1000 * 60 * 60 * 2L;
List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, false);
List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, true);
if (tempOrderList != null && tempOrderList.size() > 0)
--
Gitblit v1.8.0