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

@@ -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");
 		// "http://test.iamberry.com//mallorder/order";
 
 		// set Requeset Data

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

@@ -150,7 +150,7 @@ public class MQTask implements InitializingBean {
 		logger.info("---------------- 根据订单号拉取物流信息开始 ---------------");
 		lock.lock();
 		List<Order> orderList = null;
-		String url = NameUtils.getConfig("rst_base_url");
+		String url = NameUtils.getConfig("rst_efast_base_url");
 		String sdId = NameUtils.getConfig("sd_id");
 		Map<String, Object> orderData = new HashMap<String, Object>();
 		Map<String, String> requestData = new HashMap<String, String>();

watero-wechat-web/src/main/resources/platform.properties

@@ -118,8 +118,8 @@ sd_idt=001
 rst_base_url=http://test.iamberry.com/rst/mcahine/getMachineInfo?barCode=
 # efast_base_url
 efast_base_url=http://121.199.165.244/efast_test/efast_api/webservice/web/index.php
-# rst_base_url
-rst_base_url=http://test.iamberry.com/rst/mallorder/order
+# rst_efast_base_url
+rst_efast_base_url=http://test.iamberry.com/rst/mallorder/order
 # order_field
 order_field=order_sn,deal_code,order_status,shipping_status,pay_status,process_status,is_send,is_locked,is_separate,consignee,address,zipcode,tel,mobile,shipping_name,pay_name,invoice_no,order_amount ,money_paid,user_id ,orders.goods_sn,orders.goods_name,orders.goods_number,orders.goods_price,orders.goods_barcode,orders.payment_ft,pay_time,to_buyer,postscript,order_amount,user_nick,money_paid,shipping_fee
 # binding downlod

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

@@ -153,7 +153,7 @@ public class MQTask implements InitializingBean {
 		logger.info("---------------- 根据订单号拉取物流信息开始 ---------------");
 		lock.lock();
 		List<Order> orderList = null;
-		String url = NameUtils.getConfig("rst_base_url");
+		String url = NameUtils.getConfig("rst_efast_base_url");
 		String sdId = NameUtils.getConfig("sd_id");
 		Map<String, Object> orderData = new HashMap<String, Object>();
 		Map<String, String> requestData = new HashMap<String, String>();