From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
index 546b7aa..26cb698 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -266,7 +266,7 @@
return orderList;
}
- private void addOrder(List<TaoBaoOrder> orderList) {
+ public void addOrder(List<TaoBaoOrder> orderList) {
if (orderList != null)
for (int i = 0; i < orderList.size(); i++) {
@@ -413,6 +413,7 @@
public void addLostOrder() {
if (!Constant.IS_TASK)
return;
+ LogHelper.test("澶勭悊涓㈠け璁㈠崟");
List<LostOrder> list = lostOrderService.listByStateAndResultCode(LostOrder.STATE_PASS,
LostOrder.RESULT_CODE_VERFING, 1, 50);
if (list != null)
@@ -420,15 +421,16 @@
List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderService.getTaoBaoOrderByOrderId(lo.getOrderId());
// 娓呴櫎棰戠巼闄愬埗
if (taoBaoOrderList != null && taoBaoOrderList.size() > 0) {
- String key = "addorder-" + lo.getOrderId();
+ String key = "addorderqueue-" + lo.getOrderId();
redisManager.removeCommonString(key);
addOrder(taoBaoOrderList);
+ LogHelper.test("鑷姩澶勭悊娣樺疂璁㈠崟:" + lo.getOrderId());
}
}
}
/**
- * 澶勭悊娣樺疂缁撶畻璁㈠崟,姣忓皬鏃舵墽琛屼竴娆�
+ * 澶勭悊娣樺疂缁撶畻璁㈠崟,30fen鎵ц涓�娆�
*/
@Scheduled(cron = "30 0 0/1 * * ? ")
public void doSettleOrders() {
@@ -449,4 +451,22 @@
addOrder(orderList);
}
+ /**
+ * 13鍒嗛挓鏇存柊鏈�杩�13鍒嗛挓鐨勭粨绠楁暟鎹�
+ */
+ @Scheduled(cron = "0 0/13 * * * ? ")
+ public void doSettleOrdersToday() {
+ if (!Constant.IS_TASK)
+ return;
+ // 澶勭悊3-15澶╁墠鐨勮鍗曪紝姣忓ぉ璺戜竴娆�
+ Calendar ca = Calendar.getInstance();
+ long startTime = ca.getTimeInMillis() - 1000 * 60 * 5L - 1000 * 60 * 13L;
+ long endTime = startTime + 1000 * 60 * 13L;
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, false);
+ List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, true);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ addOrder(orderList);
+ }
+
}
--
Gitblit v1.8.0