From c12b6ec43f6c79426d6f2337f903d3c0a225e9a5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 二月 2019 10:39:01 +0800
Subject: [PATCH] 订单错误信息捕捉修改

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java |   88 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 9 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 87a3f5f..2f492be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -19,8 +19,10 @@
 import com.yeshi.fanli.service.inter.common.DataMonitorService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
 import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;
+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;
@@ -74,6 +76,9 @@
 	@Resource
 	private RedisManager redisManager;
 
+	@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<>();
@@ -109,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) {
@@ -177,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;
@@ -221,7 +285,7 @@
 	public void doJob2() {
 		if (!Constant.IS_TASK)
 			return;
-		doJob4();
+		doTaoBaoWeiQuan();
 
 		orderProcessService.fanli();
 	}
@@ -237,7 +301,7 @@
 	// 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
 	// 30鍒嗛挓涓�娆�
 	@Scheduled(cron = "0 0/30 * * * ? ")
-	public void doJob4() {
+	public void doTaoBaoWeiQuan() {
 		if (!Constant.IS_TASK)
 			return;
 		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -250,12 +314,18 @@
 		orderProcessService.weiQuanOrder(orderList);
 	}
 
-	// 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�
-	@Scheduled(cron = "0 0/2 * * * ? ")
-	public void doJob7() {
-		if (!Constant.IS_TASK)
-			return;
-		pidOrderService.doPidOrder();
+	// 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�(鍚庣画鐗堟湰搴熼櫎)
+	// @Scheduled(cron = "0 0/2 * * * ? ")
+	// public void doPidOrder() {
+	// if (!Constant.IS_TASK)
+	// return;
+	// pidOrderService.doPidOrder();
+	// }
+
+	// 姣�6涓皬鏃舵墽琛屼竴娆�
+	@Scheduled(cron = "0 0 0/6 * * ? ")
+	public void doLostOrder() {
+		lostOrderService.processFail();
 	}
 
 }

--
Gitblit v1.8.0