From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +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 | 84 ++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 51 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 96a0e8b..7e0e6d5 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
@@ -37,6 +37,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;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@@ -98,51 +99,7 @@
* @return
*/
public static List<TaoBaoOrder> getCommonOrder(long startTime, long endTime) {
- List<TaoBaoOrder> orderList = new ArrayList<>();
- long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
- int count = (int) (span / 1200);
- if (span % 1200 != 0)
- count++;
- for (int i = 0; i < count; i++) {
- long startT = startTime + i * 1200 * 1000L;
- int s = 1200;
- if (endTime < startT + 1200 * 1000L) {
- s = (int) ((endTime - startT) / 1000) + 1;
- if (s < 60)
- s = 60;
- }
- List<TaoBaoOrder> tempOrderList = getCommonOrder(startT, s);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
- return orderList;
- }
-
- /**
- * 鐖彇涓夋柟璁㈠崟
- *
- * @param startTime
- * @param endTime
- * @return
- */
- public static List<TaoBaoOrder> getThirdCommonOrder(long startTime, long endTime) {
- List<TaoBaoOrder> orderList = new ArrayList<>();
- long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
- int count = (int) (span / 1200);
- if (span % 1200 != 0)
- count++;
- for (int i = 0; i < count; i++) {
- long startT = startTime + i * 1200 * 1000L;
- int s = 1200;
- if (endTime < startT + 1200 * 1000L) {
- s = (int) ((endTime - startT) / 1000) + 1;
- if (s < 60)
- s = 60;
- }
- List<TaoBaoOrder> tempOrderList = getThirdCommonOrder(startT, s);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 1);
return orderList;
}
@@ -193,9 +150,6 @@
// orderList.addAll(thirdOrderList);
// 鏂扮増鏈鐞嗘柟寮�
List<TaoBaoOrder> orderList = getCommonOrder(startTime, endTime);
- List<TaoBaoOrder> tempOrderList2 = getThirdCommonOrder(startTime, endTime);
- if (tempOrderList2 != null && tempOrderList2.size() > 0)
- orderList.addAll(tempOrderList2);
LogHelper.orderInfo("姝ｅ湪鎵ц璁㈠崟鐖彇缁撴潫锛屽叡鏈夎鍗�:" + orderList.size());
addOrder(orderList);
@@ -278,7 +232,6 @@
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String key = its.next();
- List<TaoBaoOrder> orders = map.get(key);
String redisKey = "addorderqueue-" + key;
// redis鍋氶鐜囬檺鍒�
try {
@@ -329,7 +282,8 @@
public void doJob6() {
if (!Constant.IS_TASK)
return;
- long endTime = System.currentTimeMillis() - 1000 * 60;
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateOrder(endTime - 1000 * 60 * 20L, endTime);
}
@@ -526,7 +480,6 @@
Long endTime = System.currentTimeMillis() - 1000 * 60 * 10L;
Long startTime = endTime - 1000 * 60 * 60 * 12L;
updateLocalTaoBaoOrder(startTime, endTime, 1, 2000);
-
}
public void updateLocalTaoBaoOrder(Long startTime, Long endTime, int page, int count) {
@@ -559,6 +512,9 @@
}
}
+ /**
+ * 澶勭悊鏈�杩�5澶╃殑鏈湴璁㈠崟
+ */
@Scheduled(cron = "30 13 3 * * ? ")
public void doLatest5DayLocalTaoBaoOrder() {
if (!Constant.IS_TASK)
@@ -573,4 +529,30 @@
}
}
+ /**
+ * 澶勭悊涓婃湀璁㈠崟鎴愬姛
+ */
+ @Scheduled(cron = "0 0 12 25 * ? ")
+ public void doSellerNotPayOrder() {
+ if (!Constant.IS_TASK)
+ return;
+ Calendar calender = Calendar.getInstance();
+ long endTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calender.getTimeInMillis(), "yyyy-MM"),
+ "yyyy-MM");
+ calender.add(Calendar.MONTH, -1);
+ long startTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calender.getTimeInMillis(), "yyyy-MM"),
+ "yyyy-MM");
+ // 鍟嗗鏈粯娆�
+ List<TaoBaoOrder> orderList = taoBaoOrderService.listByStateAndCreateTime("璁㈠崟鎴愬姛", new Date(startTime),
+ new Date(endTime));
+
+ if (orderList != null)
+ for (TaoBaoOrder order : orderList)
+ try {
+ orderProcessService.doTaoBaoSellerNotPaid(order);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
}
--
Gitblit v1.8.0