From fc855f524ba0c8dc3222da76d28b38afbac69fe0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 18:35:25 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
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..88fd25a 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
@@ -42,8 +42,8 @@
public R addHouse(ComOpsHouseDTO comOpsHouseDTO) {
ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
BeanUtils.copyProperties(comOpsHouseDTO,comOpsHouseDO);
- comOpsHouseDAO.insert(comOpsHouseDO);
- return R.ok();
+ int inserted = comOpsHouseDAO.insert(comOpsHouseDO);
+ return inserted==1?R.ok():R.fail();
}
/**
@@ -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();
}
@@ -142,8 +127,8 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserRealName())){
- Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserRealName());
+ if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserName())){
+ Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserName());
if (userId==null){
userId = -1L;
}
@@ -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