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

@@ -149,7 +149,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 
 	@Override
 	public boolean addOrderInfoToEfast(MQMessage message) throws Exception {
-		logger.info("WaterPF addOrderInfoToEfast begin...");
+		logger.info("Watero addOrderInfoToEfast begin...");
 		// orderInfo
 		Order order = adminOrderService.getShopOrderByOrderId(message.getServiceToMessage());
 		if (order == null || order.getSalesOrderid() == null) {
@@ -297,7 +297,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		requestData.put("info", orderDataStr);
 
 		try {
-			logger.info("WaterPF HttpClient431Util.doGet begin..."+url+"requestData..="+requestData.get("info")+"accpt="+requestData.get("app_act"));
+			logger.info("Water HttpClient431Util.doGet begin..."+url+"requestData..="+requestData.get("info")+"accpt="+requestData.get("app_act"));
 			String result = HttpClient431Util.doPost(requestData, url);
 			result = StringEscapeUtils.unescapeJava(result); // unicode 编码
 			logger.info("add-推送订单号为:" + order.getSalesOrderid() + "的订单返回信息:" + result);
@@ -311,7 +311,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 					return true;
 				}
 			}
-			logger.error(this, "add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
+			logger.error(this, "watero add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
 			throw new Exception(jsonObject.getString("msg"));
 		} catch (Exception e) {
 			e.printStackTrace();