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/pdd/UpdatePDDOrderJob.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java
index d472ddc..b75fa67 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java
@@ -16,10 +16,11 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
+import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
-@Component
+//@Component
public class UpdatePDDOrderJob {
@Resource
@@ -42,9 +43,9 @@
*/
String key = "pdd-order-" + order.getOrderSn();
String result = redisManager.getCommonString(key);
- if (!StringUtil.isNullOrEmpty(result))
- continue;
- JDOrderCMQManager.getInstance().addJDOrder(order.getOrderSn() + "");
+// if (!StringUtil.isNullOrEmpty(result))
+// continue;
+ PDDOrderCMQManager.getInstance().addPDDOrder(order.getOrderSn() + "");
redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
} catch (PDDOrderException e) {
e.printStackTrace();
@@ -56,6 +57,8 @@
*/
@Scheduled(cron = "0 0/1 * * * ? ")
public void updateSoonOrder() {
+// if (!Constant.IS_TASK)
+// return;
Date now = null;
now = PinDuoDuoApiUtil.getSystemTime();
if (now == null)
@@ -72,6 +75,8 @@
*/
@Scheduled(cron = "0 0/30 * * * ? ")
public void updateUpdateOrder() {
+// if (!Constant.IS_TASK)
+// return;
long endTime = System.currentTimeMillis() - 1000 * 60 * 60L;
long startTime = System.currentTimeMillis() - 1000 * 60 * 60 * 24L;
int page = 1;
--
Gitblit v1.8.0