From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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..146d834 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
@@ -12,10 +12,11 @@
 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.Constant;
+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.pinduoduo.PinDuoDuoApiUtil;
 
 //浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@@ -34,21 +35,26 @@
 	 * @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;
-				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 +62,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 +80,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