From 6fdcc0c26dd33e87a024a69ed635d9aedb59cad6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 一月 2020 12:02:50 +0800
Subject: [PATCH] 订单搜索引擎增量更新

---
 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 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 a419f16..9407c2f 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
@@ -15,6 +15,7 @@
 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.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
@@ -37,16 +38,24 @@
 	 */
 	public void saveJDOrders(List<JDOrder> jdOrderList) {
 		for (JDOrder order : jdOrderList) {
-			LogHelper.orderInfo("浜笢璁㈠崟:" + order.getOrderId());
-			if (order.getValidCode() == 15)// 杩囨护鎺変唬浠樻鐘舵��
+			LogHelper.orderInfo("浜笢璁㈠崟:" + order.getOrderId() + "-" + order.getValidCode());
+			if (order.getValidCode() == 15)// 杩囨护鎺夊緟浠樻
 				continue;
+
+			//闃叉澶氫釜鍟嗗搧鎷嗗崟闂锛岀埇鍙�
+			if (order.getOrderItemList().size() > 1
+					&& order.getOrderTime() > System.currentTimeMillis() - 1000 * 60 * 2L) {
+				continue;
+			}
+
 			try {
 				jdOrderService.addJDOrder(order);
 				/**
 				 * 鍋氶鐜囬檺鍒�
 				 */
-				String key = "jd-order-" + order.getOrderId();
+				String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.JDOrder,  order.getOrderId() + "" );
 				String result = redisManager.getCommonString(key);
+				// 鍒ゆ柇
 
 				JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");
 				redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2灏忔椂鍐呬笉鍐嶆洿鏂�
@@ -63,7 +72,7 @@
 	public void updateSoonOrder() {
 		if (!Constant.IS_TASK)
 			return;
-		LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");		
+		LogHelper.job("寮�濮嬬埇鍙栦含涓滆鍗�");
 		long now = System.currentTimeMillis();
 
 		JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
@@ -132,7 +141,7 @@
 		for (int i = 0; i < 24; i++) {
 			Date da = new Date(startTime.getTime() + 1000 * 60 * 60L * i);
 			if (da.getTime() > now.getTime())
-				return;
+				break;
 			List<JDOrder> tempOrderList = getHourOrder(da);
 			if (tempOrderList != null && tempOrderList.size() > 0)
 				orderList.addAll(tempOrderList);

--
Gitblit v1.8.0