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

@@ -182,7 +182,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 						couponMoney = couponType.getCouponReduce();
 						break;
 					case 2:
-						couponMoney = order.getSalesAmount() * couponType.getCouponReduce() / 100;
+						couponMoney = order.getSalesAmount() * couponType.getCouponReduce();
 						break;
 				}
 			}

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

@@ -245,12 +245,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);                                    // 应付款,应付款金额要与已付款金额相同
 
 		/**
 		 * 产品信息
@@ -276,10 +276,10 @@ 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("discount",(item.getItemProductDiscount() / 100.0));
+			orders1.put("payment_ft", (item.getItemProductDiscount() * avgPercentage * item.getItemNum()));                // 产品分摊价
+			orders1.put("discount",item.getItemProductDiscount());
 			if (productType != null) {
 				boolean productFlag = false; //用来判断当前产品是否为水机
 				for (int i = 0; i < productType.length; i++) {
@@ -297,7 +297,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 					filterFlag = true;
 					filterMap.add(orders1);
 					filterItem += item.getItemNum();
-					filterMoney += item.getItemProductDiscount() / 100 * item.getItemNum();
+					filterMoney += item.getItemProductDiscount()  * item.getItemNum();
 				}
 			} else {
 				maps.add(orders1);
@@ -315,7 +315,7 @@ 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());                    // 订单总额
 		orderData.put("user_name", order.getSalesOpenid());                            // 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
 		orderData.put("zipcode", order.getSalesAddressPostnum());                        // 邮编