根据房型查询对应房价列表

jeecg-mall-api/src/main/java/org/jeecg/config/WebConfig.java

@@ -46,7 +46,7 @@ public class WebConfig implements WebMvcConfigurer {
 		registry
 				.addInterceptor(thirdSessionInterceptor)
 				.addPathPatterns("/mall-api/**")  //拦截路径
-                .excludePathPatterns("/mall-api/wxuser/ma-login","/mall-api/hotel/can-use-hotel-list","/mall-api/hotel/queryById","/mall-api/hotel/can-user-rooms");     //不拦截路径
+                .excludePathPatterns("/mall-api/wxuser/ma-login","/mall-api/hotel/can-use-hotel-list","/mall-api/hotel/queryById","/mall-api/hotel/can-user-rooms","/mall-api/hotel/room-layout-price");     //不拦截路径
 		WebMvcConfigurer.super.addInterceptors(registry);
 
 	}

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -34,10 +34,12 @@ import org.jeecg.modules.order.service.impl.CesOrderCommentServiceImpl;
 import org.jeecg.modules.rooms.DTO.CanUseRequestParamDto;
 import org.jeecg.modules.rooms.Vo.CanUseResultVo;
 import org.jeecg.modules.rooms.entity.CesRoomLayout;
+import org.jeecg.modules.rooms.entity.CesRoomLayoutPrice;
 import org.jeecg.modules.rooms.entity.CesRooms;
 import org.jeecg.modules.rooms.service.CesRoomLayoutPriceServiceImpl;
 import org.jeecg.modules.rooms.service.CesRoomLayoutServiceImpl;
 import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
+import org.jeecg.modules.rooms.service.ICesRoomLayoutPriceDateService;
 import org.jeecg.modules.system.entity.SysTenant;
 import org.jeecg.modules.system.service.ISysTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +80,8 @@ public class HotelController extends WebConfig {
     private IBusRoomsLivingOrderService busRoomsLivingOrderService;
     @Resource
     private IBusBookingRoomsService busBookingRoomsService;
+    @Resource
+    private CesRoomLayoutPriceServiceImpl cesRoomLayoutPriceService;
 
     /**
      * 酒店列表查询
@@ -125,7 +129,7 @@ public class HotelController extends WebConfig {
                                                       HttpServletRequest req) {
         Page<BusHotel> page = new Page<BusHotel>(pageNo, pageSize);
         String tenantId = TenantContextHolder.getTenantId();
-        IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, keyWord, sort,lat,lng);
+        IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, keyWord, sort, lat, lng);
         return Result.OK(pageList);
     }
 
@@ -163,19 +167,20 @@ public class HotelController extends WebConfig {
 
     /**
      * 根据酒店查询评价列表
+     *
      * @param cesOrderComment
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
-    @ApiOperation(value="根据酒店查询评价列表", notes="根据酒店查询评价列表")
+    @ApiOperation(value = "根据酒店查询评价列表", notes = "根据酒店查询评价列表")
     @GetMapping(value = "/comment-list")
     @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
     public Result<IPage<CesOrderComment>> getCommentPageList(CesOrderComment cesOrderComment,
-                                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                                        HttpServletRequest req) {
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest req) {
         LambdaQueryWrapper<CesOrderComment> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderComment, req.getParameterMap()).lambda();
         Page<CesOrderComment> page = new Page<CesOrderComment>(pageNo, pageSize);
         IPage<CesOrderComment> pageList = cesOrderCommentService.page(page, queryWrapper);
@@ -185,11 +190,12 @@ public class HotelController extends WebConfig {
 
     /**
      * 酒店预定订单添加
+     *
      * @param busRoomBookingOrders
      * @return
      */
     @AutoLog(value = "酒店预定订单-添加")
-    @ApiOperation(value="酒店预定订单-添加", notes="酒店预定订单-添加")
+    @ApiOperation(value = "酒店预定订单-添加", notes = "酒店预定订单-添加")
     @PostMapping(value = "/hotel-room-booking")
     @ApiLogin
     @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
@@ -215,16 +221,17 @@ public class HotelController extends WebConfig {
 
     /**
      * 预定/入住订单列表
-     * @param type 1 入住订单查询->livingStatus | 2 bookingStatus
-     * @param livingStatus -1 正常入住，1 已结账退房，2 先走未结,3 联房退房
+     *
+     * @param type          1 入住订单查询->livingStatus | 2 bookingStatus
+     * @param livingStatus  -1 正常入住，1 已结账退房，2 先走未结,3 联房退房
      * @param bookingStatus 1 预定中 2 在住 3 已取消
      * @return
      */
-    @ApiOperation(value="预定/入住订单列表", notes="预定/入住订单列表")
-    @RequestMapping(value = "/kedan-orders",method = RequestMethod.GET)
+    @ApiOperation(value = "预定/入住订单列表", notes = "预定/入住订单列表")
+    @RequestMapping(value = "/kedan-orders", method = RequestMethod.GET)
     @ApiLogin
     @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
-    public Result<IPage<KeLiItemVo>> keli(Page<KeLiItemVo> page,String keyw, Integer livingStatus, String hotelId, Integer type, Integer bookingStatus) {
+    public Result<IPage<KeLiItemVo>> keli(Page<KeLiItemVo> page, String keyw, Integer livingStatus, String hotelId, Integer type, Integer bookingStatus) {
         if (type == null) throw new JeecgBootException("参数错误");
         if (type == 1 && livingStatus == null) throw new JeecgBootException("参数错误");
         if (type == 2 && bookingStatus == null) throw new JeecgBootException("参数错误");
@@ -238,6 +245,7 @@ public class HotelController extends WebConfig {
 
     /**
      * 查询已入住酒店信息
+     *
      * @return
      */
     @ApiOperation(value = "查询已入住酒店信息", notes = "查询已入住酒店信息")
@@ -265,4 +273,21 @@ public class HotelController extends WebConfig {
         }
         return Result.ok(busHotel);
     }
+
+    /**
+     * 根据房型查询对应房价列表
+     *
+     * @param layoutId
+     * @return
+     */
+    @ApiOperation(value = "根据房型查询对应房价列表", notes = "根据房型查询对应房价列表")
+    @GetMapping(value = "/room-layout-price")
+    @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+    public Result<List<CesRoomLayoutPrice>> getRoomLayoutPrice(@RequestParam(name = "layoutId", required = true) String layoutId, @RequestParam(name = "type", required = true) Integer type) {
+        LambdaQueryWrapper<CesRoomLayoutPrice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CesRoomLayoutPrice::getLayoutId, layoutId);
+        lambdaQueryWrapper.eq(CesRoomLayoutPrice::getType, type);
+        List<CesRoomLayoutPrice> list = cesRoomLayoutPriceService.list(lambdaQueryWrapper);
+        return Result.ok(list);
+    }
 }