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

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

@@ -148,7 +148,8 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		List<OrderItem> items = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
 		
 		// request url
-		String url = NameUtils.efast_base_url;
+		//String url = NameUtils.efast_base_url;
+		String url = NameUtils.getConfig("rst_base_url");
 		
 		// set Requeset Data
 		Map<String, String> requestData = new HashMap<String, String>();
@@ -175,12 +176,13 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		/**
 		 * 系统级参数
 		 */
-		requestData.put("app_nick", NameUtils.app_nick);
+		/*requestData.put("app_nick", NameUtils.app_nick);
 		requestData.put("app_key", NameUtils.app_key);
 		requestData.put("app_secret", NameUtils.app_secret);
 		requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
-		requestData.put("app_act", message.getServiceOtherMessage()); // "efast.trade.new.add"
-		
+		requestData.put("app_act", message.getServiceOtherMessage());*/ // "efast.trade.new.add"
+		requestData.put("app_act", "rst.trade.new.add");
+
 		/**
 		 * 订单基本信息
 		 */
@@ -212,12 +214,12 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("consignee", order.getSalesAddressName());						// 收货人
 		orderData.put("district_name", addressDesc[2]);									// 区域
 		orderData.put("email", "");														// email
-		orderData.put("goods_amount", (order.getSalesAmount()/100.0));					// 产品总价
+		orderData.put("goods_amount", order.getSalesAmount());					// 产品总价
 		orderData.put("goods_count", items.size());										// 产品数量
 		orderData.put("mobile", order.getSalesAddressTel());							// 手机号码
-		orderData.put("money_paid", (money/100.0));					// 已付款
+		orderData.put("money_paid", money);					// 已付款
 		orderData.put("oid", order.getSalesOrderid());									// 订单号
-		orderData.put("order_amount", (order.getSalesAmount()/100.0));					// 订单金额
+		orderData.put("order_amount", order.getSalesAmount());					// 订单金额
 		
 		/**
 		 * 产品信息
@@ -227,9 +229,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 			Map<String, Object> orders1 = new HashMap<String, Object>();
 			orders1.put("goods_name", item.getItemProductName());							// 产品名称
 			orders1.put("goods_number", item.getItemNum());									// 产品数量
-			orders1.put("goods_price", (item.getItemProductPrice()/100.0));					// 产品原价
+			orders1.put("goods_price", item.getItemProductPrice());					// 产品原价
 			orders1.put("outer_sku", item.getProduectRemark());										// 产品SKU
-			orders1.put("payment_ft", (item.getItemProductDiscount()/100.0));												// 产品分摊价
+			orders1.put("payment_ft", item.getItemProductDiscount());												// 产品分摊价
 			maps.add(orders1);
 		}
 		
@@ -241,9 +243,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("sd_id", "001");													// 对应 efast 店铺 id
 		orderData.put("shipping_fee", 0);												// 快递费
 		orderData.put("shipping_name", "yto");											// 快递公司代码
-		orderData.put("tel", "");											// 我司电话
+		orderData.put("tel", order.getSalesAddressTel());											// 我司电话
 		orderData.put("to_buyer", "");													// 商家备注
-		orderData.put("total_amount", (order.getSalesAmount()/100.0));					// 商家备注
+		orderData.put("total_amount", order.getSalesAmount());					// 商家备注
 		orderData.put("user_name", order.getSalesOpenid());							// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
 		orderData.put("zipcode", order.getSalesAddressPostnum());						// 邮编
 		

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

@@ -148,6 +148,17 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 	}
 
 
+	public void main(String[] args) throws Exception {
+		MQMessage message = new MQMessage();
+		String orderIdMD5 = "11231232132131311";
+		message.setServiceToMessage(orderIdMD5);
+		message.setServiceOtherMessage("efast.trade.new.add");
+		message.setServiceIsSend(2);			// 没有推送的信息
+		message.setServiceStatus(1); 			// 推送成功
+		message.setServiceType(1); 				// 添加订单信息
+		Boolean bl = addOrderInfoToEfast(message);
+		System.out.println("hello + bl:"+bl);
+	}
 
 	@Override
 	public boolean addOrderInfoToEfast(MQMessage message) throws Exception {
@@ -249,12 +260,12 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("consignee", order.getSalesAddressName());						// 收货人
 		orderData.put("district_name", addressDesc[2]);									// 区域
 		orderData.put("email", "");														// email
-		orderData.put("goods_amount", (order.getSalesAmount()/100.0));					// 商品总价
+		orderData.put("goods_amount", (order.getSalesAmount()));					// 商品总价
 		orderData.put("goods_count", items.size());										// 产品数量
 		orderData.put("mobile", order.getSalesAddressTel());							// 手机号码
-		orderData.put("money_paid", (money/100.0));										// 已付款
+		orderData.put("money_paid", money);										// 已付款
 		orderData.put("oid", order.getSalesOrderid());									// 订单号
-		orderData.put("order_amount", (money/100.0));									// 应付款,应付款金额要与已付款金额相同
+		orderData.put("order_amount", money);									// 应付款,应付款金额要与已付款金额相同
 		
 		
 		/**
@@ -265,9 +276,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 			Map<String, Object> orders1 = new HashMap<String, Object>();
 			orders1.put("goods_name", item.getItemProductName());							// 产品名称
 			orders1.put("goods_number", item.getItemNum());									// 产品数量
-			orders1.put("goods_price", (item.getItemProductPrice()/100.0));					// 产品原价
+			orders1.put("goods_price", (item.getItemProductPrice()));					// 产品原价
 			orders1.put("outer_sku", item.getProduectRemark());								// 产品SKU
-			orders1.put("payment_ft", (item.getItemProductDiscount()/100.0*avgPercentage*item.getItemNum()));				// 产品分摊价
+			orders1.put("payment_ft", (item.getItemProductDiscount()*avgPercentage*item.getItemNum()));				// 产品分摊价
 			maps.add(orders1);
 		}
 		
@@ -281,7 +292,8 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("shipping_name", "yto");											// 快递公司代码
 		orderData.put("tel", order.getSalesAddressTel());											// 我司电话
 		orderData.put("to_buyer", "");													// 商家备注
-		orderData.put("total_amount", (order.getSalesAmount()/100.0));					// 订单总额
+		//orderData.put("total_amount", (order.getSalesAmount()/100.0));					// 订单总额
+		orderData.put("total_amount", (order.getSalesAmount()));					// 订单总额
 		orderData.put("user_name", order.getSalesOpenid());							// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
 		orderData.put("zipcode", order.getSalesAddressPostnum());						// 邮编