提交

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

@@ -11,12 +11,14 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.dto.BatchOrderSavaDto;
 import org.jeecg.modules.business.dto.BookingOrderSaveDto;
 import org.jeecg.modules.business.entity.BusBookingBatch;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
+import org.jeecg.modules.business.entity.BusOrderFee;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 import org.jeecg.modules.business.service.IBusRoomBookingOrdersService;
 
@@ -274,6 +276,18 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 		 return  Result.OK("入住成功",service.customerLiving(param,isTeam));
 	 }
 
+	 /**
+	  * 获取入住订单费用账单
+	  * @param livingOrderId
+	  * @return
+	  */
+	 @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));
+	 }
+
 
 
  }

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

@@ -4,6 +4,7 @@ import org.jeecg.modules.business.dto.BatchOrderSavaDto;
 import org.jeecg.modules.business.dto.BookingOrderSaveDto;
 import org.jeecg.modules.business.entity.BusBookingBatch;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
+import org.jeecg.modules.business.entity.BusOrderFee;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.business.vo.BatchOrderEditVo;
@@ -42,4 +43,6 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam);
 
     List<FloorBuildingRoomVo> getRealtimeInfo(List<CesRooms> rooms);
+
+    List<BusOrderFee> getLivingOrderFee(String orderId);
 }

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

@@ -987,6 +987,12 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         return roomVos;
     }
 
+    @Override
+    public List<BusOrderFee> getLivingOrderFee(String orderId) {
+        List<BusOrderFee> orderFees = feeService.list(Wrappers.<BusOrderFee>query().eq("living_order_id",orderId));
+        return orderFees;
+    }
+
     private Map<String,String> bookingRoomToLiving(BookingOrderSaveDto livingData, List<ExtendBusBookingRoomsVo> roomIds, BookingOrderEditVo bookingOrderVo) {
         Map<String,String> results = new HashMap<>();
 

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

@@ -2,10 +2,7 @@ package org.jeecg.modules.business.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.jeecg.modules.business.dto.BookingBatchRoomsDto;
-import org.jeecg.modules.business.dto.BookingLayoutRoomsDto;
 import org.jeecg.modules.business.entity.BusBookingLayoutDayPrice;
-import org.jeecg.modules.business.entity.BusBookingRooms;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 
 import java.util.List;

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

@@ -2,10 +2,7 @@ package org.jeecg.modules.business.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
-import org.jeecg.modules.business.entity.BusBookingLayoutDayPrice;
-import org.jeecg.modules.business.entity.BusBookingRooms;
-import org.jeecg.modules.business.entity.BusLivingCustomer;
-import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
+import org.jeecg.modules.business.entity.*;
 
 import java.util.List;