From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 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 1f3f905..1cfeaa4 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
@@ -12,9 +12,11 @@
import com.yeshi.fanli.dto.jd.JDOrderResult;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.exception.jd.JDOrderException;
-import com.yeshi.fanli.service.inter.jd.JDOrderService;
+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.RedisManager;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
import com.yeshi.fanli.util.jd.JDApiUtil;
@@ -35,7 +37,8 @@
*/
public void saveJDOrders(List<JDOrder> jdOrderList) {
for (JDOrder order : jdOrderList) {
- if (order.getValidCode() == 15)// 杩囨护鎺変唬浠樻鐘舵��
+ LogHelper.orderInfo("浜笢璁㈠崟:" + order.getOrderId()+"-"+order.getValidCode());
+ if (order.getValidCode() == 15)// 杩囨护鎺夊緟浠樻
continue;
try {
jdOrderService.addJDOrder(order);
@@ -60,6 +63,7 @@
public void updateSoonOrder() {
if (!Constant.IS_TASK)
return;
+ LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
long now = System.currentTimeMillis();
JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
@@ -93,4 +97,60 @@
saveJDOrders(jdOrderList);
}
+ /**
+ * 鏇存柊涓�涓皬鏃剁殑璁㈠崟
+ *
+ * @param date
+ */
+ private List<JDOrder> getHourOrder(Date date) {
+ List<JDOrder> jdOrderList = new ArrayList<>();
+ int pageSize = 200;
+ int page = 1;
+ JDOrderResult result = JDApiUtil.getOrderList(page++, pageSize, date, JDApiUtil.ORDER_TYPE_UPDATETIME);
+ if (result != null) {
+ jdOrderList.addAll(result.getOrderList());
+ while (result != null && result.isHasMore()) {
+ result = JDApiUtil.getOrderList(page++, pageSize, date, JDApiUtil.ORDER_TYPE_UPDATETIME);
+ if (result != null)
+ jdOrderList.addAll(result.getOrderList());
+ }
+ }
+ return jdOrderList;
+ }
+
+ /**
+ * 鏇存柊涓�澶╃殑鏁版嵁
+ *
+ * @param date
+ */
+ public void updateDayOrder(Date date) {
+ Date now = new Date();
+ List<JDOrder> orderList = new ArrayList<>();
+ Date startTime = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));
+ // 涓�涓皬鏃朵负涓�涓闀�
+ 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