From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整
---
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
index f4456a2..9eaa34f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
@@ -6,7 +6,6 @@
import javax.annotation.Resource;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import com.xxl.job.core.biz.model.ReturnT;
@@ -16,7 +15,6 @@
import com.yeshi.fanli.exception.jd.JDOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -72,19 +70,26 @@
/**
* 蹇�熻鍗曟洿鏂帮紙鐖彇鏈皬鏃跺唴鐨勫崟,姣忓垎閽熶竴娆★級
*/
- @XxlJob("updateJDSoonOrderHandler")
- public ReturnT<String> startPreDividents(String param) throws Exception {
+ @XxlJob("updateJDOrderHandler")
+ public ReturnT<String> updateJDSoonOrder(String param) throws Exception {
+ if ("1".equalsIgnoreCase(param)) {// 鏇存柊鏈皬鏃跺唴鐨勫崟
+ LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
+ long now = System.currentTimeMillis();
- LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
- long now = System.currentTimeMillis();
-
- JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
- if (result != null && result.getOrderList() != null)
- saveJDOrders(result.getOrderList());
- // 鏌ヨ涓婁釜灏忔椂鐨�
- result = JDApiUtil.getOrderList(1, 200, new Date(now - 1000 * 60 * 60L), JDApiUtil.ORDER_TYPE_CREATETIME);
- if (result != null && result.getOrderList() != null)
- saveJDOrders(result.getOrderList());
+ JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
+ if (result != null && result.getOrderList() != null)
+ saveJDOrders(result.getOrderList());
+ // 鏌ヨ涓婁釜灏忔椂鐨�
+ result = JDApiUtil.getOrderList(1, 200, new Date(now - 1000 * 60 * 60L), JDApiUtil.ORDER_TYPE_CREATETIME);
+ if (result != null && result.getOrderList() != null)
+ saveJDOrders(result.getOrderList());
+ } else if ("1hour".equalsIgnoreCase(param)) {// 鏇存柊1灏忔椂鍐呯殑璁㈠崟
+ updateUpdateOrder();
+ } else if ("1day".equalsIgnoreCase(param)) {// 鏇存柊1灏忔椂鍐呯殑璁㈠崟
+ updateLatestDayOrder(new Date(System.currentTimeMillis()));
+ } else if ("3day".equalsIgnoreCase(param)) {// 鏇存柊鏈�杩�3澶╂洿鏂扮殑鏁版嵁
+ updateLatest3DayOrder();
+ }
return ReturnT.SUCCESS;
}
@@ -92,10 +97,8 @@
/**
* 鐖彇鏈�杩戜竴灏忔椂鍐呯殑鐘舵�佹洿鏂颁簡鐨勫崟(10鍒嗛挓涓�娆�)
*/
- @Scheduled(cron = "0 0/10 * * * ? ")
+
public void updateUpdateOrder() {
- if (!Constant.IS_TASK)
- return;
List<JDOrder> jdOrderList = new ArrayList<>();
int pageSize = 200;
int page = 1;
@@ -155,12 +158,30 @@
}
/**
+ * 鏇存柊鏈�杩戜竴澶╃殑鏁版嵁
+ *
+ * @param date
+ */
+ public void updateLatestDayOrder(Date date) {
+ Date now = new Date();
+ List<JDOrder> orderList = new ArrayList<>();
+ Date startTime = new Date(date.getTime() - 1000 * 60 * 60 * 24L);
+ // 涓�涓皬鏃朵负涓�涓闀�
+ for (int i = 0; i < 24; i++) {
+ Date da = new Date(startTime.getTime() + 1000 * 60 * 60L * i);
+ if (da.getTime() > now.getTime())
+ break;
+ List<JDOrder> tempOrderList = getHourOrder(da);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ saveJDOrders(orderList);
+ }
+
+ /**
* 鏇存柊鏈�杩�3澶╃殑璁㈠崟锛堟瘡澶╂棭涓婂噷鏅�0鐐硅繃10鍒嗭紝鏃╀笂8鐐硅繃10鍒嗭級
*/
- @Scheduled(cron = "0 10 0,8 * * ? ")
public void updateLatest3DayOrder() {
- if (!Constant.IS_TASK)
- return;
Date now = new Date();
for (int i = 1; i < 4; i++) {
updateDayOrder(new Date(now.getTime() - 1000 * 60 * 60 * 24L * i));
--
Gitblit v1.8.0