From eb78e9183005efa02064956cc9ef2299dc2d2bdd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 八月 2019 16:01:58 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 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..28c24ff 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
@@ -363,7 +363,6 @@
if (!Constant.IS_TASK)
return;
long endTime = System.currentTimeMillis() - 1000 * 60;
- ;
updateOrder(endTime - 1000 * 60 * 20L, endTime);
}
@@ -372,8 +371,7 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- doTaoBaoWeiQuan();
-
+ doTaoBaoWeiQuanOrder(2);
orderProcessService.fanli();
}
@@ -385,34 +383,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 +441,16 @@
// 澶勭悊缁存潈璁㈠崟
orderProcessService.weiQuanOrder(orderList);
}
+
+ }
+
+ // 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
+ // 30鍒嗛挓涓�娆�
+ @Scheduled(cron = "0 0/30 * * * ? ")
+ public void doTaoBaoWeiQuan() {
+ if (!Constant.IS_TASK)
+ return;
+ doTaoBaoWeiQuanOrder(5);
}
// 姣�6涓皬鏃舵墽琛屼竴娆�
--
Gitblit v1.8.0