获取所有可用房间模式下，房间返回门市价

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

@@ -298,7 +298,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             List<BusRoomsLivingOrder> livingOrders =
                     livingBookingRoomIds.size() > 0?
                     roomsLivingOrderService.list(Wrappers.<BusRoomsLivingOrder>query()
-                    .in("booking_room_id",livingBookingRoomIds)): new ArrayList<>();
+                    .eq("booking_order_id",orderId)): new ArrayList<>();
             List<String> livingOrderIds = livingOrders.stream().map(r->r.getId()).collect(Collectors.toList());
             List<BusLivingCustomer> livingCustomers =livingOrderIds.size()>0? livingCustomerService.list(Wrappers.<BusLivingCustomer>query()
             .in("living_order_id", livingOrderIds)):new ArrayList<>();
@@ -778,6 +778,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         if(bkRoom.getBookingType().equals(BookingOrdersType.NORMAL.getKey())) {
             //todo other
             livingOrder = copyBookingToAcceptOrder(bookingOrders);
+            livingOrder.setBookingRoomId(bookingRoomId);
         } else if(bkRoom.getBookingType().equals(BookingOrdersType.TEAM.getKey())) {
             BusBookingBatch batch = bookingBatchService.getById(bkRoom.getBookingBatchId());
             if(batch == null) throw new JeecgBootException("批次不存在");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesRooms.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.rooms.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
@@ -100,6 +102,12 @@ public class CesRooms extends Model<CesRooms> {
      */
     private Boolean invalid;
 
+    /**
+     * 返回的房间房型的门市价格
+     */
+    @TableField(exist = false)
+    private BigDecimal marketPrice;
+
 
     public static final String ID = "id";
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomsServiceImpl.java

@@ -315,6 +315,13 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
                 // 设置完size之后添加已用房间 不影响数量
                 List<String> currentFloorRoomIds = floorRooms.stream().map(r->r.getId()).collect(Collectors.toList());
                 List<CesRooms> orderRooms = finalChoiceRooms.stream().filter(y->y.getFloorId().equals(c.getId()) && !currentFloorRoomIds.contains(y.getId())).collect(Collectors.toList());
+                orderRooms.forEach(p->{
+                    Optional<CesRoomLayout> opLayout = layouts.stream().filter(i->i.getId().equals(p.getLayoutId())).findFirst();
+                    if(opLayout.isPresent()) {
+                        CesRoomLayout roomLayout = opLayout.get();
+                        p.setMarketPrice(roomLayout.getMarketPrice());
+                    }
+                });
                 floorRooms.addAll(orderRooms);
                 floorRoomsVo.setFloorRooms(floorRooms);
                 floorVos.add(floorRoomsVo);