支付功能

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

@@ -735,8 +735,14 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
                 // 手动接单，发消息给商家
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
-                String live_end = DateUtil.parseDate(booking.getOrderStartTime(),DateUtil.Time_Formatter_Day) +"~"+  DateUtil.parseDate(booking.getOrderEndTime(),DateUtil.Time_Formatter_Day);
-                Message2.send(adminManager.getOpenid(),order_num,booking.getHouseName(),live_end,booking.getUserName(),booking.getHotelName());
+                String live_end = booking.getOrderStartTime() +"~"+  booking.getOrderEndTime();
+                String hotelName = "";
+                if (Func.checkNull(booking.getHotelName()))
+                {
+                    hotelName = booking.getHouseName();
+                }
+
+                Message2.send(adminManager.getOpenid(),order_num,booking.getHouseName(),live_end,booking.getUserName(),hotelName);
 
                 int m = bookService.updateBooking(booking);
                 if (m>0){