预定修改

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

@@ -130,13 +130,18 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     List<String> Ids = new ArrayList<>();
                     AtomicInteger i = new AtomicInteger();
                     if (houseNumbers != null){
-                        houseNumberList.forEach(houseNumber -> {
-                            //添加的房间不在不可添加的房间当中并且数量小于订房总数
-                            if (!houseNumbers.contains(houseNumber) && i.get() < book.getHouseOrderNumber()){
+//                        houseNumberList.forEach(houseNumber -> {
+//                            //添加的房间不在不可添加的房间当中并且数量小于订房总数
+//
+//                        });
+                        List<String> houseStrs = houseNumbers.stream().map(HouseNumber::getId).collect(Collectors.toList());
+                        for (HouseNumber houseNumber: houseNumberList) {
+                            if (!houseStrs.contains(houseNumber.getId()) && i.get() < book.getHouseOrderNumber()){
                                 Ids.add(houseNumber.getId());
                                 i.getAndIncrement();
                             }
-                        });
+                        }
+
                     }else {
                         //所有房间都可以预定
                         houseNumberList.forEach(houseNumber -> {

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

@@ -80,7 +80,7 @@ public class HouseNumberImplDao implements HouseNumberDao {
     public List<HouseNumber> queryHouseStatus(Booking book) {
         String sql = "select `id`,`house_id`,`number_name`,`create_id`,`create_date`,`modify_date`,IF(b.number_id is not null, 3, `status`) as `status` from \n" +
                 "(select * from house_number where house_id = :house_id and status != 0) a\n" +
-                "left join (select number_id from house_number_status where DATE_FORMAT(set_date,'%Y-%m-%d') >= :order_start_time and DATE_FORMAT(set_date,'%Y-%m-%d') <= :order_end_time and booking_id != :booking_id and `status` > 1 group by number_id) b on a.id = b.number_id";
+                "inner join (select number_id from house_number_status where DATE_FORMAT(set_date,'%Y-%m-%d') >= :order_start_time and DATE_FORMAT(set_date,'%Y-%m-%d') <= :order_end_time and booking_id != :booking_id and `status` > 1 group by number_id) b on a.id = b.number_id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("house_id", book.getHouseId());
         sps.addValue("booking_id", book.getId());