查询主房如果结账。那么整个booking订单也会结账退房

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomBookingOrders.java

@@ -192,5 +192,7 @@ public class BusRoomBookingOrders implements Serializable {
     @TableField(exist = false)
     private Boolean isTeam;
 
+    @TableField(exist = false)
+    private Integer settleType;
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -350,6 +350,11 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                 Optional<BusRoomsLivingOrder> opLvOrder = livingOrders.stream().filter(a->a.getBookingRoomId().equals(r.getId())).findFirst();
 
                 if(opLvOrder.isPresent()){
+                    Optional<ExtendBusBookingRoomsVo> opBookingRoomsVo = bookingRooms.stream().filter(b->b.getIsMain().equals(true) && b.getId().equals(opLvOrder.get().getBookingRoomId())).findFirst();
+                    if(opBookingRoomsVo.isPresent() &&
+                            (opLvOrder.get().getSettleType().equals(SettleTypeEnum.SETTLE_LEAVE.getKey()) || opLvOrder.get().getSettleType().equals(SettleTypeEnum.UN_SETTLE_LEAVE.getKey()))) {
+                        orderInfo.setSettleType(opLvOrder.get().getSettleType());
+                    }
                     BusRoomsLivingOrder order = opLvOrder.get();
                     List<BusLivingCustomer> currentLivingCustomers = livingCustomers.stream().filter(s->s.getLivingOrderId().equals(order.getId())).collect(Collectors.toList());
                     r.setLivingOrder(order);