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

@@ -296,6 +296,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		requestData.put("info", orderDataStr);
 		
 		try {
+			logger.info("WaterPF HttpClient431Util.doGet begin...");
 			String result = HttpClient431Util.doPost(requestData, url);
 			result = StringEscapeUtils.unescapeJava(result); // unicode 编码
 			logger.info("add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
@@ -313,6 +314,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		throw new Exception(jsonObject.getString("msg"));
 	} catch (Exception e) {
 		throw e;
+
 	}
 	}
 	

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

@@ -146,7 +146,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 
 	@Override
 	public boolean addOrderInfoToEfast(MQMessage message) throws Exception {
-
+		logger.info("WaterPF addOrderInfoToEfast Start.....");
 		// orderInfo
 		Order order = adminOrderService.getShopOrderByOrderId(message.getServiceToMessage());
 		if (order == null || order.getSalesOrderid() == null) {
@@ -345,9 +345,10 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				requestData.put("info", orderDataStr);
 
 				try {
-					String result = HttpClient431Util.doGet(requestData, url);
+					logger.info("WaterPF HttpClient431Util.doGet1...");
+					String result = HttpClient431Util.doPost(requestData, url);
 					result = StringEscapeUtils.unescapeJava(result); // unicode 编码
-					logger.info("add-推送订单号为:" + order.getSalesOrderid() + j + "的订单，百胜返回信息:" + result);
+					logger.info("WaterPF add-推送订单号为:" + order.getSalesOrderid() + j + "的订单，百胜返回信息:" + result);
 					// parse JSON String to Object
 					JSONObject jsonObject = JSONObject.fromObject(result);
 					JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
@@ -361,7 +362,8 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 					logger.error(this, "add-推送订单号为:" + order.getSalesOrderid() + j + "的订单，百胜返回信息:" + result);
 					//throw new Exception(respData.getString("msg"));
 				} catch (Exception e) {
-					//e.printStackTrace();
+					e.printStackTrace();
+					logger.info("WaterPF addOrderInfoToEfast error1...");
 				}
 			}
 		}
@@ -387,7 +389,8 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 			requestData.put("info", orderDataStr);
 
 			try {
-				String result = HttpClient431Util.doGet(requestData, url);
+				logger.info("WaterPF HttpClient431Util.doGet2...");
+				String result = HttpClient431Util.doPost(requestData, url);
 				result = StringEscapeUtils.unescapeJava(result); // unicode 编码
 				logger.info("add-推送订单号为:" + "ZP" +  order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
 				// parse JSON String to Object
@@ -403,9 +406,11 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				logger.error(this, "add-推送订单号为:" + "ZP" +  order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
 				throw new Exception(jsonObject.getString("msg"));
 			} catch (Exception e) {
-				//e.printStackTrace();
+				e.printStackTrace();
+				logger.info("WaterPF addOrderInfoToEfast error2...");
 			}
 		}
+		logger.info("WaterPF addOrderInfoToEfast end......");
 		return returnFlag;
 	}