Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/action/bookAction.java

@@ -160,7 +160,9 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             if (m > 0) {
                 //推送信息
                 if(!"".equals(sendMsg)){
-                    String errmsg = Message.wxErrorMsg(Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime().substring(0,10)));
+                    String liveTime = book.getLiveTime()!=null ? book.getLiveTime().substring(0,10):"";
+                    String endTime = book.getCheckOutTime()!=null ? book.getCheckOutTime().substring(0,10):"";
+                    String errmsg = Message.wxErrorMsg(Message.send(user.getOpenid(),book.getHotelName(),book.getOrderStatus(),liveTime,endTime,book.getHouseName()));
                     if("请求成功".equals(errmsg)){
                         resultJson.put("message", msg+"成功");
                         resultJson.put("code", 200);