From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |   10 ++--------
 1 files changed, 2 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 5582ded..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,7 +205,7 @@
 				public void run() {
 					while (true) {
 						try {
-							
+
 							// 鍙�16涓鍗�
 							List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
 							if (orderIds != null) {
@@ -570,7 +570,6 @@
 						}
 					} catch (Exception e) {
 						LogHelper.error("杩樻鍑洪敊:" + e.getMessage());
-
 					}
 				}
 			}
@@ -635,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