From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java | 12 ++++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 11 ++++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java | 7 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java | 40 ++++++++++++-------
5 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
index 13789a8..a9b4b32 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
@@ -78,7 +78,7 @@
@ApiOperation(value = "房屋租售-修改")
@PostMapping("putHouse")
public R updateHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseVO comOpsHouseVO) {
- return communityService.putOpsHouse(comOpsHouseVO);
+ return communityService.putOpsHouseByApplets(comOpsHouseVO);
}
@ApiOperation(value = "房屋租售-删除")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 1f3a277..27a30c1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -895,21 +895,18 @@
R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO);
/**
* 根据id查询留言列表
- * @param id 用户id
* @return 发布结果
*/
@PostMapping("pagemessagebyuser")
R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO);
/**
* 根据id删除留言
- * @param id id
* @return 删除结果
*/
@PostMapping("deletemessage")
R deleteMessage(@RequestBody ComActMessageVO comActMessageVO);
/**
* 根据id集合批量设置是否公开
- * @param ids id集合
* @return 删除结果
*/
@PostMapping("resetmessagepublic")
@@ -962,6 +959,14 @@
R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO);
/**
+ * 房屋租售-小程序修改
+ * @param comOpsHouseVO 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("/putOpsHouseByApplets")
+ R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+ /**
* 房屋租售-上下架
* @param comOpsHouseVO 上下架参数
* @return 上下架结果
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..9f1bbd5 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
@@ -90,4 +90,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;
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java
index 83edc01..9892698 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java
@@ -51,4 +51,11 @@
* @return 上下架结果
*/
R undercarriageHouse(ComOpsHouseUndercarriageVO comOpsHouseVO);
+
+ /**
+ * 房屋租售-小程序修改
+ * @param comOpsHouseVO 修改参数
+ * @return 修改结果
+ */
+ R putHouseByApplets(ComOpsHouseVO comOpsHouseVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
index 0d6d861..4e2dfcb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
@@ -75,23 +75,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R putHouse(ComOpsHouseVO comOpsHouseVO) {
-
- //判断当前房屋租售信息状态
- if(comOpsHouseVO.getId() == null){
- return R.fail("参数错误");
- }
- ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId());
- if(oldComOpsHouseDO == null){
- return R.fail("该房屋租售信息不存在");
- }
- if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){
- return R.fail("该房屋租售信息不可修改,请刷新");
- }
-
ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
BeanUtils.copyProperties(comOpsHouseVO,comOpsHouseDO);
- //设置房屋租售信息为待审核
- comOpsHouseDO.setStatus(OpsHouseStatus.AUDIT.getCode());
comOpsHouseDAO.updateById(comOpsHouseDO);
return R.ok();
}
@@ -177,4 +162,29 @@
return R.ok();
}
+ /**
+ * 房屋租售-小程序修改
+ * @param comOpsHouseVO 修改参数
+ * @return 修改结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R putHouseByApplets(ComOpsHouseVO comOpsHouseVO) {
+
+ ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId());
+ if(oldComOpsHouseDO == null){
+ return R.fail("该房屋租售信息不存在");
+ }
+ if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){
+ return R.fail("该房屋租售信息不可修改,请刷新");
+ }
+
+ ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
+ BeanUtils.copyProperties(comOpsHouseVO,comOpsHouseDO);
+ //设置房屋租售信息为待审核
+ comOpsHouseDO.setStatus(OpsHouseStatus.AUDIT.getCode());
+ comOpsHouseDAO.updateById(comOpsHouseDO);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1