From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +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/jd/UpdateJDOrderJob.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 e4d2b68..54faf69 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
@@ -13,14 +13,12 @@
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.util.Constant;
import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
import com.yeshi.fanli.util.jd.JDApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
-@Component
+//@Component
public class UpdateJDOrderJob {
@Resource
@@ -35,7 +33,9 @@
* @param jdOrderList
*/
public void saveJDOrders(List<JDOrder> jdOrderList) {
- for (JDOrder order : jdOrderList)
+ for (JDOrder order : jdOrderList) {
+ if (order.getValidCode() == 15)// 杩囨护鎺変唬浠樻鐘舵��
+ continue;
try {
jdOrderService.addJDOrder(order);
/**
@@ -49,6 +49,7 @@
} catch (JDOrderException e) {
e.printStackTrace();
}
+ }
}
/**
@@ -56,10 +57,15 @@
*/
@Scheduled(cron = "0 0/1 * * * ? ")
public void updateSoonOrder() {
- if (!Constant.IS_TASK)
- return;
+ // if (!Constant.IS_TASK)
+ // return;
+ long now = System.currentTimeMillis();
- JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(), JDApiUtil.ORDER_TYPE_CREATETIME);
+ 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 * 60 * 24L), JDApiUtil.ORDER_TYPE_CREATETIME);
if (result != null && result.getOrderList() != null)
saveJDOrders(result.getOrderList());
}
@@ -69,8 +75,8 @@
*/
@Scheduled(cron = "0 0/10 * * * ? ")
public void updateUpdateOrder() {
- if (!Constant.IS_TASK)
- return;
+ // if (!Constant.IS_TASK)
+ // return;
List<JDOrder> jdOrderList = new ArrayList<>();
int pageSize = 200;
int page = 1;
--
Gitblit v1.8.0