From 033a7cd02b9799a0acf42290fdc84d74bdcee79c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 15:33:12 +0800
Subject: [PATCH] 热门搜素更改

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java |   64 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
index 72cc5f6..2f492be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -22,6 +22,7 @@
 import com.yeshi.fanli.service.inter.order.LostOrderService;
 import com.yeshi.fanli.service.inter.order.OrderItemServcie;
 import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.order.OrderService;
 import com.yeshi.fanli.service.inter.order.PidOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -77,7 +78,7 @@
 
 	@Resource
 	private LostOrderService lostOrderService;
-
+	
 	private void updateOrder(long startTime, long endTime) {
 		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
 		List<TaoBaoOrder> orderList = new ArrayList<>();
@@ -113,7 +114,66 @@
 
 	}
 
+	private void addRelationAndSpecialOrder(List<TaoBaoOrder> orderList) {
+		try {
+			taoBaoOrderService.addTaoBaoOrderList(orderList);
+		} catch (Exception e) {
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
+		}
+
+		try {
+			Map<String, List<TaoBaoOrder>> map = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList);
+			if (map != null) {
+				Iterator<String> its = map.keySet().iterator();
+				while (its.hasNext()) {
+					String key = its.next();
+					List<TaoBaoOrder> orders = map.get(key);
+					String redisKey = "addorderqueue-" + key;
+					// redis鍋氶鐜囬檺鍒�
+					try {
+						if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
+							continue;
+						}
+
+					} catch (Exception e) {
+
+					}
+
+					CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);
+
+					try {
+						// 6灏忔椂鍐呬笉鍐嶅鐞�
+						redisManager.cacheCommonString(redisKey, "1", 60 * 60 * 6);
+					} catch (Exception e) {
+
+					}
+				}
+			}
+		} catch (Exception e) {
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
+		}
+	}
+
 	private void addOrder(List<TaoBaoOrder> orderList) {
+
+		if (orderList != null)
+			for (int i = 0; i < orderList.size(); i++) {
+				// 绉婚櫎浼氬憳杩愯惀ID涓庢笭閬撲笓灞炶鍗�
+				if (orderList.get(i).getAdPositionName().contains("浼氬憳杩愯惀")
+						|| orderList.get(i).getAdPositionName().contains("娓犻亾涓撳睘")) {
+					orderList.remove(i);
+					i--;
+				}
+			}
+
 		try {
 			taoBaoOrderService.addTaoBaoOrderList(orderList);
 		} catch (Exception e) {
@@ -181,7 +241,7 @@
 	}
 
 	// 娣樺疂鎺ㄥ箍璁㈠崟 姣忛殧3鍒�13绉掓墽琛屼竴娆�
-	@Scheduled(cron = "13 0/3 0 24,25 * ? ")
+	@Scheduled(cron = "13 0/3 * * * ? ")
 	public void doJob6() {
 		if (!Constant.IS_TASK)
 			return;

--
Gitblit v1.8.0