From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 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 cc3d8d5..ff7297a 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
@@ -6,17 +6,17 @@
import javax.annotation.Resource;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.pdd.PDDOrderResult;
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.exception.pdd.PDDOrderException;
-import com.yeshi.fanli.service.inter.pdd.PDDOrderService;
+import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
+import com.yeshi.fanli.util.RedisKeyEnum;
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.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@@ -35,30 +35,46 @@
* @param jdOrderList
*/
public void savePDDOrders(List<PDDOrder> orderList) {
- for (PDDOrder order : orderList)
+ for (PDDOrder order : orderList) {
+ if (order.getOrderStatus() == 2) {
+ System.out.println(order);
+ }
+
try {
pddOrderService.addOrder(order);
/**
* 鍋氶鐜囬檺鍒�
*/
- String key = "pdd-order-" + order.getOrderSn();
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.PDDOrder, order.getOrderSn() + "");
String result = redisManager.getCommonString(key);
-// if (!StringUtil.isNullOrEmpty(result))
-// continue;
+ // if (!StringUtil.isNullOrEmpty(result))
+ // continue;
PDDOrderCMQManager.getInstance().addPDDOrder(order.getOrderSn() + "");
redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
} catch (PDDOrderException e) {
e.printStackTrace();
}
+ }
+ }
+
+ /**
+ * 鎷煎澶氳鍗曠埇鍙�
+ */
+ @XxlJob("updatePDDOrderHandler")
+ public ReturnT<String> updatePDDOrder(String param) throws Exception {
+ if ("1".equalsIgnoreCase(param)) {// 鏇存柊鏈皬鏃跺唴鐨勫崟
+ updateSoonOrder();
+ } else if ("1day".equalsIgnoreCase(param)) {// 鐖彇鏈�杩�1澶╃殑璁㈠崟(30鍒嗛挓涓�娆�)
+ updateUpdateOrder();
+ }
+ return ReturnT.SUCCESS;
}
/**
* 蹇�熻鍗曟洿鏂帮紙鐖彇鏈皬鏃跺唴鐨勫崟,姣忓垎閽熶竴娆★級
*/
- @Scheduled(cron = "0 0/1 * * * ? ")
+ // @Scheduled(cron = "0 0/1 * * * ? ")
public void updateSoonOrder() {
-// if (!Constant.IS_TASK)
-// return;
Date now = null;
now = PinDuoDuoApiUtil.getSystemTime();
if (now == null)
@@ -73,10 +89,8 @@
/**
* 鐖彇鏈�杩�1澶╃殑璁㈠崟(30鍒嗛挓涓�娆�)
*/
- @Scheduled(cron = "0 0/30 * * * ? ")
+ // @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