查询订单联房所有账单记录

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

@@ -283,9 +283,9 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	  */
 	 @ApiOperation(value="酒店预定订单-获取入住订单费用账单", notes="酒店预定订单-获取入住订单费用账单")
 	 @RequestMapping(value = "/living-fees",method = RequestMethod.GET)
-	 public Result<List<BusOrderFee>> getLivingOrderFees(String livingOrderId) {
-	 	if(livingOrderId == null || livingOrderId.isEmpty()) throw new JeecgBootException("参数错误");
-	 	return Result.ok(service.getLivingOrderFee(livingOrderId));
+	 public Result<List<BusOrderFee>> getLivingOrderFees(String bookingOrderId) {
+	 	if(bookingOrderId == null || bookingOrderId.isEmpty()) throw new JeecgBootException("参数错误");
+	 	return Result.ok(service.getLivingOrderFee(bookingOrderId));
 	 }
 
 

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

@@ -989,8 +989,13 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     public List<BusOrderFee> getLivingOrderFee(String orderId) {
-        List<BusOrderFee> orderFees = feeService.list(Wrappers.<BusOrderFee>query().eq("living_order_id",orderId));
-        return orderFees;
+        List<BusRoomsLivingOrder> livingOrders = roomsLivingOrderService.list(Wrappers.<BusRoomsLivingOrder>query().eq("booking_order_id",orderId));
+        if(livingOrders.size() > 0) {
+            List<String> livingOrderIds = livingOrders.stream().map(s->s.getId()).collect(Collectors.toList());
+            List<BusOrderFee> orderFees = feeService.list(Wrappers.<BusOrderFee>query().in("living_order_id",livingOrderIds));
+            return orderFees;
+        } else return  new ArrayList<>();
+
     }
 
     private Map<String,String> bookingRoomToLiving(BookingOrderSaveDto livingData, List<ExtendBusBookingRoomsVo> roomIds, BookingOrderEditVo bookingOrderVo) {

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

@@ -0,0 +1,16 @@
+package org.jeecg.modules.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.business.entity.BusOrderFee;
+import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
+
+import java.util.List;
+
+@Data
+public class RoomOrderFeeVo {
+    private List<BusOrderFee> roomFees;
+    @ApiModelProperty(value = "入住详情")
+    private BusRoomsLivingOrder livingOrder;
+
+}