bug

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

@@ -373,15 +373,6 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             return null;
         }
 
-        //是否能取消订单（1是 2否）
-        if (Func.parseInt(book.getHotelIsCanorder()) == 2)
-        {
-            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.message, "商家设置不可取消订单，请联系商家");
-            ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
-            return null;
-        }
-
         AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
 
         //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款,10退款中
@@ -410,6 +401,15 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             }
         }
 
+        //是否能取消订单（1是 2否）
+        if (Func.parseInt(book.getHotelIsCanorder()) == 2)
+        {
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, "商家设置不可取消订单，请联系商家");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
+            return null;
+        }
+
         Users users = userService.queryByUserId(book.getCreateUserid()); // 用户信息
         if (users == null) {
             jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());

mhotel/src/com/happy/dao/impl/HotelImplDao.java

@@ -201,7 +201,7 @@ public class HotelImplDao implements HotelDao {
 
     @Override
     public List<Hotel> queryList(String sqlx) {
-        String sql = "SELECT * FROM `hotel` WHERE status=1 "+sqlx;
+        String sql = "SELECT * FROM `hotel`  WHERE status=1   "+sqlx;
         List<Hotel> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Hotel.class));

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

@@ -61,7 +61,7 @@ public class AppBookImplService implements AppBookService {
 
         // 设置民宿信息
         booking.setHotelId(Func.parseStr(hotel.getId()));
-        booking.setHotelName(hotel.getHotel_name()); // 创建表单的时候，取酒店名称(数据来源于admin_manager中的hotel_name)
+        booking.setHotelName(adminManager.getHotelName()); // 创建表单的时候，取酒店名称(数据来源于admin_manager中的hotelname)
         booking.setHotelHposition(hotel.getHposition());
         booking.setHotelHpositionWens(hotel.getHpositionWens());
         booking.setHotelManagerId(hotel.getManagerId());