Merge remote-tracking branch 'origin/master'

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

@@ -611,6 +611,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         for (int i = 0; i < booking.size(); i++) {
             if (booking.get(i) == null)
                 continue;
+
             book = booking.get(i);
             w = new WechatUnifiedOrder();
             w.setAppid(WeiXinUtil.appid_c);
@@ -641,21 +642,18 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
                 Users users = userService.queryByUserId(book.getCreateUserid());
                 String sendMsg = "订单:"+ book.getOrderNum();
-                // 推给用户（需求确定，用户点取消退款以后[标识订单状态已取消]只发商家，不发用户。  商家点拒单以后[标识订单状态已退单]发商家和用户）
-                if (book.getOrderStatus().equals(Func.parseStr(PayEnum.EIGHT.getNum())))
-                {
+                // 推给用户（需求确定，用户点取消退款以后[标识订单状态已取消]只发商家，不发用户。  商家点拒单以后[标识订单状态已退单]只发用户不发商家）
+                int status = Func.parseInt(book.getOrderStatus());
+                if (status == PayEnum.EIGHT.getNum()){
                     Message.send(users.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
                 }
 
                 // 推给商家
                 String live_end = book.getOrderStartTime().substring(0,10)  +"~"+  book.getOrderEndTime().substring(0,10);
-                String hotelName = book.getHotelName();
-                if (Func.checkNull(book.getHotelName()))
-                {
-                    hotelName = book.getHouseName();
+                String hotelName = Func.checkNull(book.getHotelName()) ? book.getHotelName() : book.getHouseName();
+                if (status ==  PayEnum.SEVEN.getNum()) {
+                    Message2.send(adminManager.getOpenid(), book.getOrderNum(), book.getHouseName(), live_end, book.getUserName(), hotelName, Func.parseStr(book.getId()));
                 }
-                Message2.send(adminManager.getOpenid(),book.getOrderNum(),book.getHouseName(),live_end,book.getUserName(),hotelName,Func.parseStr(book.getId()));
-
             }
         }
         String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";