feats

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java

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