收费项目不挂在主房上了，取消此逻辑，与千兰不一样

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -278,7 +278,7 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 
 	 /**
 	  * 获取入住订单费用账单
-	  * @param livingOrderId
+	  * @param bookingOrderId
 	  * @return
 	  */
 	 @ApiOperation(value="酒店预定订单-获取入住订单费用账单", notes="酒店预定订单-获取入住订单费用账单")

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

@@ -1009,8 +1009,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             if(customers == null || customers.size() == 0) throw new JeecgBootException("请添加客户信息");
             String livingOrderId = bookingToLive(bkRoom.getId(), customers);
             // 费用关联到主房
-            if(livingData.getOrderFees()!=null && livingData.getOrderFees().size() > 0 && bkRoom.getIsMain() !=null && bkRoom.getIsMain()) {
-                livingData.getOrderFees().forEach(s->{
+            if(livingData.getOrderFees()!=null && livingData.getOrderFees().size() > 0 ) {
+                List<BusOrderFee> findRoomFees = livingData.getOrderFees().stream().filter(t->t.getRoomId().equals(bkRoom.getRoomId())).collect(Collectors.toList());
+                findRoomFees.forEach(s->{
                     s.setRoomId(bkRoom.getRoomId());
                     s.setLivingOrderId(livingOrderId);
                     s.setCreateTime(new Date());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/RoomOrderFeeVo.java

@@ -8,8 +8,8 @@ import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
 import java.util.List;
 
 @Data
-public class RoomOrderFeeVo {
-    private List<BusOrderFee> roomFees;
+public class RoomOrderFeeVo extends BusOrderFee {
+    private String roomName;
     @ApiModelProperty(value = "入住详情")
     private BusRoomsLivingOrder livingOrder;