Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -310,10 +310,10 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				}
 			}
 			logger.error(this, "add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
-			throw new Exception(respData.getString("msg"));
-		} catch (Exception e) {
-			throw e;
-		}
+		throw new Exception(respData.getString("msg"));
+	} catch (Exception e) {
+		throw e;
+	}
 	}
 	
 	
@@ -479,7 +479,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 							money += order.getSalesAmount() * couponType.getCouponReduce()/100;
 							break;
 						}
-					}
+	}
 				}
 				
 				/**

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -160,7 +160,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 
 		// request url
 		//String url = NameUtils.getConfig("efast_base_url");
-		String url = NameUtils.getConfig("rst_base_url");
+		String url = NameUtils.getConfig("rst_efast_base_url");
 		// set Requeset Data
 		Map<String, String> requestData = new HashMap<String, String>();
 

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -186,9 +186,9 @@ public class MQTask implements InitializingBean {
 			}
 		}catch (Exception e){
 			logger.error("拉取订单异常",e.getMessage());
-		}finally {
-			lock.unlock();
+		}finally {lock.unlock();
 		}
+
 		logger.info("---------------- 根据订单号拉取物流信息结束 ---------------");
 	}