From 23f7b250c00597ad89282075460a4c27dffe1ada Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:39:06 +0800
Subject: [PATCH] Merge branch 'dev-msg'
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 44 +-------------------------------------------
1 files changed, 1 insertions(+), 43 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 f574aa2..d45d399 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -86,8 +86,7 @@
if (Constant.IS_TASK) {
doExtractResult();// 澶勭悊鎻愮幇缁撴灉
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
- doOrderFanLi();// 澶勭悊璁㈠崟杩斿埄
- doOrderFanLiNew();//鏂扮増杩斿埄
+ doOrderFanLiNew();// 鏂扮増杩斿埄
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
@@ -178,47 +177,6 @@
}
});
}
- }
-
- /**
- * 澶勭悊娣樺疂璁㈠崟杩斿埄
- */
- public void doOrderFanLi() {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- while (true) {
- try {
- Map<String, HongBao> map = CMQManager.getInstance().consumeFanLiMsg(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().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) {
-
- }
- }
- }
- });
}
/**
--
Gitblit v1.8.0