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-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -166,6 +166,7 @@ public class MQTask implements InitializingBean {
 					requestData.put("app_act", "rst.trade.logistics.get");
 					String orderDataStr = mapper.writeValueAsString(orderData);
 					requestData.put("info", orderDataStr);
+					logger.info("app_act==:" + requestData.get("app_act") + "info==:" + requestData.get("info"));
 					String result = HttpClient431Util.doPost(requestData, url);
 					result = StringEscapeUtils.unescapeJava(result); // unicode 编码
 					logger.info("拉取订单号为:" + order.getSalesOrderid() + "的订单，rst返回信息:" + result);

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

@@ -169,6 +169,7 @@ public class MQTask implements InitializingBean {
 					requestData.put("app_act", "rst.trade.logistics.get");
 					String orderDataStr = mapper.writeValueAsString(orderData);
 					requestData.put("info", orderDataStr);
+					logger.info("app_act==:" + requestData.get("app_act") + "info==:" + requestData.get("info"));
 					String result = HttpClient431Util.doPost(requestData, url);
 					result = StringEscapeUtils.unescapeJava(result); // unicode 编码
 					logger.info("拉取订单号为:" + order.getSalesOrderid() + "的订单，rst返回信息:" + result);