|
|
@@ -166,7 +166,7 @@ public class HotelController extends WebConfig {
|
|
|
@ApiOperation(value = "可入住酒店列表", notes = "可入住酒店列表")
|
|
|
@GetMapping(value = "/can-use-hotel-list")
|
|
|
@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
|
|
|
- public Result<IPage<BusHotel>> getCanUseHotelList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
+ public Result<IPage<BusHotel>> getCanUseHotelList(HttpServletRequest request,@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
@RequestParam(name = "sort", defaultValue = "0") Integer sort,
|
|
|
@RequestParam(name = "city", defaultValue = "") String city,
|
|
|
@@ -175,6 +175,8 @@ public class HotelController extends WebConfig {
|
|
|
@RequestParam(name = "lng", defaultValue = "0") BigDecimal lng) {
|
|
|
Page<BusHotel> page = new Page<BusHotel>(pageNo, pageSize);
|
|
|
String tenantId = TenantContextHolder.getTenantId();
|
|
|
+ if (StringUtils.isBlank(tenantId))
|
|
|
+ tenantId = request.getHeader("tenant-id");
|
|
|
IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, city, keyWord, sort, lat, lng);
|
|
|
return Result.OK(pageList);
|
|
|
}
|