From dd209750c5fecd9b05e827bc3e634b06816f1249 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 09:07:31 +0800
Subject: [PATCH] 浏览足迹添加时间

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index f696be6..f574aa2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -12,9 +12,12 @@
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Component;
+import org.yeshi.utils.tencentcloud.COSManager;
+import org.yeshi.utils.tencentcloud.entity.COSInitParams;
 
 import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
 import com.yeshi.fanli.entity.bus.user.HongBao;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.push.PushQueueRecord;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -27,8 +30,6 @@
 import com.yeshi.fanli.service.inter.push.IOSPushService;
 import com.yeshi.fanli.service.inter.user.ExtractService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
-import org.yeshi.utils.tencentcloud.COSManager;
-import org.yeshi.utils.tencentcloud.entity.COSInitParams;
 
 /**
  * 绯荤粺鍒濆鍖�
@@ -86,12 +87,13 @@
 			doExtractResult();// 澶勭悊鎻愮幇缁撴灉
 			doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
 			doOrderFanLi();// 澶勭悊璁㈠崟杩斿埄
+			doOrderFanLiNew();//鏂扮増杩斿埄
 			doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
 			doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
 			doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
 		} else if (!Constant.IS_TEST) {
 			initScheduler();// 鍚姩瀹氭椂浠诲姟
-			doUpdateGoodsJob();
+			// doUpdateGoodsJob();
 		}
 	}
 
@@ -166,7 +168,11 @@
 								orderProcessService.processOrder(map);
 							}
 						} catch (Exception e) {
+							try {
+								LogHelper.errorDetailInfo(e);
+							} catch (Exception e1) {
 
+							}
 						}
 					}
 				}
@@ -191,6 +197,47 @@
 								try {
 									orderProcessService.fanli(map.get(handler));
 									CMQManager.getInstance().deleteFanLiMsg(handler);
+								} catch (TaoBaoWeiQuanException e) {
+									try {
+										LogHelper.errorDetailInfo(e);
+									} catch (Exception e1) {
+										e1.printStackTrace();
+									}
+								} catch (Exception e) {
+									try {
+										LogHelper.errorDetailInfo(e);
+									} catch (Exception e1) {
+										e1.printStackTrace();
+									}
+								}
+							}
+						}
+
+					} catch (Exception e) {
+
+					}
+				}
+			}
+		});
+	}
+
+	/**
+	 * 澶勭悊鏂扮増娣樺疂璁㈠崟杩斿埄
+	 */
+	public void doOrderFanLiNew() {
+		executor.execute(new Runnable() {
+			@Override
+			public void run() {
+				while (true) {
+					try {
+						Map<String, HongBaoV2> map = CMQManager.getInstance().consumeFanLiMsgNew(16);
+						if (map != null) {
+							Iterator<String> its = map.keySet().iterator();
+							while (its.hasNext()) {
+								String handler = its.next();
+								try {
+									orderProcessService.fanli(map.get(handler));
+									CMQManager.getInstance().deleteFanLiMsgNew(handler);
 								} catch (TaoBaoWeiQuanException e) {
 									try {
 										LogHelper.errorDetailInfo(e);
@@ -344,7 +391,7 @@
 	public void doUpdateGoodsJob() {
 
 		// 閲囩敤4涓嚎绋嬪仛鏇存柊
-		for (int i = 0; i < 4; i++)
+		for (int i = 0; i < 1; i++)
 			executor.execute(new Runnable() {
 				@Override
 				public void run() {
@@ -376,6 +423,7 @@
 								}
 							}
 						} catch (Exception e) {
+							LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
 
 						}
 					}

--
Gitblit v1.8.0