Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -361,7 +361,7 @@ public class CartServiceImpl implements CartService {
 						}
 						try {
 							sendMessageUtil.orderApplyReturn("尊敬的朵粉，已收到您的【退货申请】",orderId,payMoney,productNum+"件",order2.getSalesReturnDes(),
-									"点击查看退款退货详情。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order2.getSalesOrderid());
+									"点击查看退款退货详情。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单申请退货，发送微信消息失败!");
 						}

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

@@ -87,6 +87,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
 			// 发货状态 : shipping_status
 			String shippingStatus = respData.getString("shipping_status");
+
+			Order orderByaddress = adminOrderService.getShopOrderByOrderId(message.getServiceToMessage());
+
 			if ("1".equals(shippingStatus)) {
 				// 更新数据:将订单从已支付、代发货状态修改为已发货状态
 				Order order = new Order();
@@ -98,14 +101,16 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				adminOrderService.updateOrderDeliver(order);
 				//推送微信发货消息
 				//给用户发送消息-已发货的通知
-				Order orderByaddress = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
-				try {
-					sendMessageUtil.orderSendSuccess("尊敬的朵粉，您的订单已发货，物流信息:",order.getSalesOrderid(), SendMessageUtil.hashmap.get(respData.getString("shipping_name")),
-							respData.getString("invoice_no"),orderByaddress.getSalesAddressInfo(),"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",orderByaddress.getSalesOpenid(), ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
-				} catch (Exception e) {
-					logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
-				}
 
+				//Order orderByaddress = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
+				if(orderByaddress.getSalesStatus() == 2){
+					try {
+						sendMessageUtil.orderSendSuccess("尊敬的朵粉，您的订单已发货，物流信息:",order.getSalesOrderid(), SendMessageUtil.hashmap.get(respData.getString("shipping_name")),
+								respData.getString("invoice_no"),orderByaddress.getSalesAddressInfo(),"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",orderByaddress.getSalesOpenid(), ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
+					} catch (Exception e) {
+						logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
+					}
+				}
 				return true;
 			}
 			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);

tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

@@ -77,8 +77,8 @@ public class WechatFilter implements Filter {
 		// 判断请求,如果是来自Ajax，那么直接返回302跳转会导致前端报错，所以返回JSON格式数据，状态为200
 		String requestedWith = req.getHeader("x-requested-with");
 		String accept = req.getHeader("accept");
-		if ((StringUtils.isNotEmpty(requestedWith) && requestedWith.indexOf("XMLHttpRequest") != -1) 
-				|| (StringUtils.isNotEmpty(accept) && accept.indexOf("json") != -1)) {
+		if ((requestedWith != null && StringUtils.isNotEmpty(requestedWith) && requestedWith.indexOf("XMLHttpRequest") != -1)
+				|| (accept != null && StringUtils.isNotEmpty(accept) && accept.indexOf("json") != -1)) {
 			// 客户端需要的是json数据
 			String redirectURL = req.getHeader("Referer");
 			resp.getWriter().write("{\"isRedirect\":true, \"redirectURL\":\"" + WechatUtils.getOpenIdFunction(redirectURL) + "\"}");

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -282,7 +282,6 @@ public class OrderHandler {
 			msg.setMessage(ResultInfo.loginOutError);
 			return msg;
 		}
-
 		member=memberService.getMemberByUserId(member.getUserId());
 		if (!validatorUtil.validatorObject(temp)) { // 校验订单信息是否输入有误
 			msg.setMessage(ResultInfo.paramFormatError);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -58,6 +58,7 @@ import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URLDecoder;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -261,10 +262,12 @@ public class ResponseWechatPayHandler {
 //System.out.println("===========pay 201  插入返利到百胜失败==============");
 					}
 					//推送消息到微信
+					DecimalFormat df=new DecimalFormat("0.00");
+					String payMoney = df.format((float)or.getSalesYetAmount()/100) + "元";
 					try {
 						sendMessageUtil.probationPaySuccess(
 								ResultInfo.PAYSUCCESS,
-								or.getSalesYetAmount()/100 + "元",
+								payMoney,
 								orderItemList.get(0).getItemProductName()+"...",
 								ResultInfo.sendRemark1,
 								order.getSalesOpenid(),