From 5fac00120acdfad0d80db84a976b605f6dc2c5a2 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 02 一月 2024 15:12:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/HousingDemandController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/HousingDemandController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/HousingDemandController.java
index eda0929..4a046e5 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/HousingDemandController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/HousingDemandController.java
@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.api;
+import com.stylefeng.guns.modular.system.model.AppUser;
import com.stylefeng.guns.modular.system.model.HouseResource;
import com.stylefeng.guns.modular.system.model.HousingDemand;
+import com.stylefeng.guns.modular.system.service.IAppUserService;
import com.stylefeng.guns.modular.system.service.ICollectionHousingDemandService;
import com.stylefeng.guns.modular.system.service.IHousingDemandService;
import com.stylefeng.guns.modular.system.service.IReportHousingDemandService;
@@ -35,6 +37,8 @@
private IReportHousingDemandService reportHousingDemandService;
@Autowired
private ICollectionHousingDemandService collectionHousingDemandService;
+ @Autowired
+ private IAppUserService appUserService;
@ResponseBody
@@ -45,13 +49,17 @@
return ResultUtil.success(houseResource.getQrCode());
}
@ResponseBody
- @PostMapping("/api/housingDemand/addHousingDemand")
+ @PostMapping("/base/housingDemand/addHousingDemand")
@ApiOperation(value = "添加房源", tags = {"求房源"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header")
})
public ResultUtil addHousingDemand(@RequestBody HousingDemandReq req){
+ AppUser appUser = appUserService.getAppUser();
+ if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){
+ return ResultUtil.errorLogin("当前账号已被冻结或删除");
+ }
return housingDemandService.addHousingDemand(req);
}
@@ -64,17 +72,20 @@
}
@ResponseBody
- @PostMapping("/api/housingDemand/housingDemandInfo")
+ @PostMapping("/base/housingDemand/housingDemandInfo")
@ApiOperation(value = "获取求房源详情", tags = {"求房源"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "数据id", required = true),
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header")
})
public ResultUtil<HousingDemandInfoRes> housingDemandInfo(Integer id){
+ AppUser appUser = appUserService.getAppUser();
+ if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){
+ return ResultUtil.errorLogin("当前账号已被冻结或删除");
+ }
HousingDemandInfoRes housingDemandInfoRes = housingDemandService.housingDemandInfo(id);
return ResultUtil.success(housingDemandInfoRes);
}
-
@ResponseBody
@PostMapping("/base/housingDemand/addReportHousingDemand")
@@ -83,6 +94,10 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header")
})
public ResultUtil addReportHousingDemand(ReportHousingDemandReq req){
+ AppUser appUser = appUserService.getAppUser();
+ if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){
+ return ResultUtil.errorLogin("当前账号已被冻结或删除");
+ }
return reportHousingDemandService.addReportHousingDemand(req);
}
@@ -93,6 +108,10 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header")
})
public ResultUtil collectionHousingDemand(Integer id){
+ AppUser appUser = appUserService.getAppUser();
+ if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){
+ return ResultUtil.errorLogin("当前账号已被冻结或删除");
+ }
return collectionHousingDemandService.collectionHousingDemand(id);
}
@@ -111,8 +130,10 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header")
})
public ResultUtil<Integer> getSurplusPushNumber(){
+ AppUser appUser = appUserService.getAppUser();
+ if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){
+ return ResultUtil.errorLogin("当前账号已被冻结或删除");
+ }
return housingDemandService.getSurplusPushNumber();
}
-
-
}
--
Gitblit v1.7.1