From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 9119ec3..81d776d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -205,12 +205,13 @@
public void run() {
while (true) {
try {
+
// 鍙�16涓鍗�
List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
- Map<String, List<TaoBaoOrder>> map = new HashMap<>();
if (orderIds != null) {
for (String orderId : orderIds) {
if (NumberUtil.isNumeric(orderId.trim())) {
+ Map<String, List<TaoBaoOrder>> map = new HashMap<>();
List<TaoBaoOrder> orderList = taoBaoOrderService
.getTaoBaoOrderByOrderId(orderId);
map.put(orderId, orderList);
@@ -569,7 +570,6 @@
}
} catch (Exception e) {
LogHelper.error("杩樻鍑洪敊:" + e.getMessage());
-
}
}
}
@@ -634,17 +634,12 @@
}
PDDOrderCMQManager.getInstance().deletePDDOrder(key);
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
}
} catch (Exception e) {
LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
-
}
}
}
--
Gitblit v1.8.0