From 34fcf32a24d06befd53c6e05ae9c41a4de24e71b Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 15 七月 2021 10:00:00 +0800 Subject: [PATCH] Merge branch 'test' into 'master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java index 5aaed89..4076b80 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java @@ -3,8 +3,13 @@ import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO; import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO; import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.ComActVO; +import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; +import com.panzhihua.service_community.model.dos.ComMngStructAreaDO; +import com.panzhihua.service_community.service.ComActService; +import com.panzhihua.service_community.service.ComMngStructAreaService; import com.panzhihua.service_community.service.ComOpsHouseService; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +29,8 @@ public class HouseApi { @Resource private ComOpsHouseService comOpsHouseService; + @Resource + private ComMngStructAreaService comMngStructAreaService; /** @@ -43,6 +50,15 @@ */ @PostMapping("addOpsHouse") public R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO){ + Long houseCommunityId = comOpsHouseDTO.getHouseCommunityId(); + if(houseCommunityId!=null) { + R<ComMngStructAreaVO> r = comMngStructAreaService.detailArea(houseCommunityId); + if(R.isOk(r)&&r.getData()!=null) { + ComMngStructAreaVO comMngStructAreaVO = r.getData(); + comOpsHouseDTO.setHouseCommunityName(comMngStructAreaVO.getAreaName()); + } + + } return comOpsHouseService.addHouse(comOpsHouseDTO); } @@ -90,4 +106,16 @@ return r; } + /** + * 房屋租售-小程序修改 + * @param comOpsHouseVO 修改参数 + * @return 修改结果 + */ + @PostMapping("putOpsHouseByApplets") + @Transactional(rollbackFor = Exception.class) + public R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO){ + R r = comOpsHouseService.putHouseByApplets(comOpsHouseVO); + return r; + } + } -- Gitblit v1.7.1