Merge remote-tracking branch 'origin/master'

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

@@ -725,19 +725,25 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 // 进行业务判断，如果是商家设定了自动接单，则支付状态直接变为待入住  接单设置（1自动接单 2手动接单）
                 if ("1".equals(booking.getHotelIsCanorder()))
                 {
-                    // 自动接单，发消息给用户,并且订单状态修改为待入住
+                    // 自动接单，订单状态修改为待入住
                     booking.setOrderStatus(Func.parseStr(PayEnum.THREE.getNum()));
-                    String userId = booking.getCreateUserid();
-                    Users users = userService.queryByUserId(userId);
-                    String mess = "您已成功订房，订单号："+order_num;
-                    Message.send(users.getOpenid(),order_num, users.getUser_name(),mess, booking.getPayTime());
-                }else {
-                    // 手动接单，发消息给商家
-                    AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
-                    String sendMsg = "订单:"+ order_num +"已支付，请确认是否接单";
-                    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 userId = booking.getCreateUserid();
+//                    Users users = userService.queryByUserId(userId);
+//                    String mess = "您已成功订房，订单号："+order_num;
+//                    Message.send(users.getOpenid(),order_num, users.getUser_name(),mess, booking.getPayTime());
                 }
+
+                // 手动接单，发消息给商家
+                AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
+                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){
                     String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";

mhotel/src/com/happy/service/impl/AppBookImplService.java

@@ -47,17 +47,17 @@ public class AppBookImplService implements AppBookService {
 
         House house = houseService.getById(Func.parseInt(houseId));
         StringBuilder s1 = new StringBuilder("");
-        s1.append(" and manager_id = '").append(house.getManagerId()).append("'");
+        s1.append(" and manager_id = '").append(house.getManagerId()).append("' ");
         Hotel hotel = hotelService.getOen(s1.toString());
         Users user = userService.queryByUserId(userId);
         AdminManager adminManager = adminManagerService.getById(Func.parseInt(house.getManagerId()));
-        if (house == null || hotel == null || user == null  || adminManager == null)
+        if (house == null || hotel == null || user == null  || adminManager == null )
             return "无法获取数据";
 
         Booking booking = new Booking();
 
         // 设置民宿信息
-        booking.setHouseId(Func.parseStr(hotel.getId()));
+        booking.setHotelId(Func.parseStr(hotel.getId()));
         booking.setHotelName(hotel.getHname());
         booking.setHotelHposition(hotel.getHposition());
         booking.setHotelHpositionWens(hotel.getHpositionWens());