Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

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

@@ -22,6 +22,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 public class bookAction extends ActionSupport implements ServletRequestAware {
@@ -123,18 +124,26 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     sendMsg = "商家已接单";
                     //验证民宿房态表
                     List<HouseNumber> houseNumbers = houseNumberService.queryHouseStatus(book);
-                    List<String> Ids = Arrays.asList(houseNumberIds.split(","));
-                    if (houseNumbers!=null){
-                        for (String id: Ids){
-                            for (HouseNumber houseNumber: houseNumbers){
-                                if (houseNumber.getStatus() != null && houseNumber.getStatus()==3 && id.equals(houseNumber.getId())){
-                                    resultJson.put("message", "选择的房间该时间段已有预定！请重新选择房间！");
-                                    resultJson.put("code", 502);
-                                    ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-                                    return null;
-                                }
+                    List<HouseNumber> houseNumberList = houseNumberService.queryByHouseId(book.getHouseId());
+                    List<String> Ids = new ArrayList<>();
+                    AtomicInteger i = new AtomicInteger();
+                    if (houseNumbers != null){
+                        houseNumberList.forEach(houseNumber -> {
+                            //添加的房间不在不可添加的房间当中并且数量小于订房总数
+                            if (!houseNumbers.contains(houseNumber) && i.get() < book.getHouseOrderNumber()){
+                                Ids.add(houseNumber.getId());
+                                i.getAndIncrement();
                             }
-                        }
+                        });
+                    }else {
+                        //所有房间都可以预定
+                        houseNumberList.forEach(houseNumber -> {
+                            //添加的房间不在不可添加的房间当中并且数量小于订房总数
+                            if (i.get() < book.getHouseOrderNumber()){
+                                Ids.add(houseNumber.getId());
+                                i.getAndIncrement();
+                            }
+                        });
                     }
                     //添加民宿房态表
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");