张延森 3 years ago
parent
commit
3eda030c0d

+ 4
- 2
src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java View File

@@ -52,8 +52,9 @@ public class BuildingSpecialRoomController extends BaseController {
52 52
      * @return
53 53
      */
54 54
     @ApiOperation(value = "admin-查询特价房源列表", notes = "admin-查询特价房源列表")
55
-    @RequestMapping(value="/buildingSpecialRoom",method= RequestMethod.GET)
56
-    public ResponseBean buildingSpecialRoomList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
55
+    @RequestMapping(value="/{plat}/buildingSpecialRoom",method= RequestMethod.GET)
56
+    public ResponseBean buildingSpecialRoomList(@PathVariable("plat") String plat,
57
+                                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
57 58
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58 59
                                                 @RequestParam(value ="buildingId") String buildingId,
59 60
                                                 @RequestHeader("authorization") String token, HttpServletRequest request){
@@ -64,6 +65,7 @@ public class BuildingSpecialRoomController extends BaseController {
64 65
             LambdaQueryWrapper<BuildingSpecialRoom> queryWrapper = new LambdaQueryWrapper<>();
65 66
             queryWrapper.eq(BuildingSpecialRoom::getOrgId,getOrgId(request));
66 67
             queryWrapper.eq(BuildingSpecialRoom::getBuildingId,buildingId);
68
+            queryWrapper.gt("wx".equals(plat), BuildingSpecialRoom::getEndTime, LocalDateTime.now());
67 69
             queryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
68 70
 
69 71
             IPage<BuildingSpecialRoom> result = iBuildingSpecialRoomService.page(pg, queryWrapper);