自动接单逻辑修改

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

@@ -894,22 +894,23 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             Booking book = bookService.queryByOrder(order_num);
             // 支付成功
             if (result.getResult_code().equals("SUCCESS") && book!=null && ("1").equals(book.getOrderStatus())) {
-                
+
                 // 保存支付信息
                 book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
                 book.setOrderStatus(Func.parseStr(PayEnum.已支付.getNum()));
                 book.setPayTime(DateUtil.getFormatPaternDate(new Date()));
                 book.setPayWay(OrderEnum.微信支付.toString());
                 // 进行业务判断，如果是商家设定了自动接单，则支付状态直接变为待入住  接单设置（1自动接单 2手动接单）
-                if ("1".equals(book.getHotelIsOrder()))
-                {
-                    // 自动接单，订单状态修改为待入住
-                    book.setOrderStatus(Func.parseStr(PayEnum.待入住.getNum()));
-                    String userId = book.getCreateUserid();
-                    Users users = userService.queryByUserId(userId);
-                    String mess = "您已成功订房，订单号："+order_num;
-                    Message.send(users.getOpenid(),book.getHotelName(),book.getOrderStatus(), book.getOrderStartTime(),book.getOrderEndTime(), book.getHouseName());
-                }
+				//目前该自动接单逻辑无法与定时的自动接单操作衔接特此屏蔽 后续可以直接删除
+//                if ("1".equals(book.getHotelIsOrder()))
+//                {
+//                    // 自动接单，订单状态修改为待入住
+//                    book.setOrderStatus(Func.parseStr(PayEnum.待入住.getNum()));
+//                    String userId = book.getCreateUserid();
+//                    Users users = userService.queryByUserId(userId);
+//                    String mess = "您已成功订房，订单号："+order_num;
+//                    Message.send(users.getOpenid(),book.getHotelName(),book.getOrderStatus(), book.getOrderStartTime(),book.getOrderEndTime(), book.getHouseName());
+//                }
 
                 // 手动接单，发消息给商家
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));

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

@@ -209,6 +209,7 @@ public class BookImplService implements BookService {
 
     @Override
     public int updateBookStatus() {
+
         HotelDict respTime = hotelDictService.getById(1000011001);//响应时间
         HotelDict operate = hotelDictService.getById(1000011002);//响应时间 1自动接单 2自动拒单
         String sqlx = " and create_time <= DATE_SUB(NOW(), INTERVAL " + respTime.getName() + " MINUTE) and order_status = 2 ";