From 433ebce4f3a20640a870480fa88f1ec499beb9ba Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 24 十月 2022 23:27:28 +0800
Subject: [PATCH] 三说会堂bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java | 141 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 110 insertions(+), 31 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 0a79897..ea7ac77 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
@@ -1,22 +1,25 @@
package com.panzhihua.service_community.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
-import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_community.dao.ComOpsHouseDAO;
-import com.panzhihua.service_community.model.dos.ComOpsHouseDO;
-import com.panzhihua.service_community.service.ComOpsHouseService;
+import javax.annotation.Resource;
+
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.enums.OpsHouseStatus;
+import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
+import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.dao.ComOpsHouseDAO;
+import com.panzhihua.service_community.model.dos.ComOpsHouseDO;
+import com.panzhihua.service_community.service.ComOpsHouseService;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,22 +35,24 @@
/**
* 房屋租售-新增
*
- * @param comOpsHouseDTO 新增参数
+ * @param comOpsHouseDTO
+ * 新增参数
* @return 新增结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R addHouse(ComOpsHouseDTO comOpsHouseDTO) {
- ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
- BeanUtils.copyProperties(comOpsHouseDTO,comOpsHouseDO);
- comOpsHouseDAO.insert(comOpsHouseDO);
- return R.ok();
+ ComOpsHouseDO comOpsHouseDO = new ComOpsHouseDO();
+ BeanUtils.copyProperties(comOpsHouseDTO, comOpsHouseDO);
+ int inserted = comOpsHouseDAO.insert(comOpsHouseDO);
+ return inserted == 1 ? R.ok() : R.fail();
}
/**
* 房屋租售-详情
*
- * @param id 主键
+ * @param id
+ * 主键
* @return ComOpsHouseVO
*/
@Override
@@ -56,19 +61,27 @@
if (ObjectUtils.isEmpty(comOpsHouseDO)) {
return R.fail("房屋租售不存在");
}
- ComOpsHouseVO comOpsHouseVO=new ComOpsHouseVO();
- BeanUtils.copyProperties(comOpsHouseDO,comOpsHouseVO);
+ ComOpsHouseVO comOpsHouseVO = new ComOpsHouseVO();
+ BeanUtils.copyProperties(comOpsHouseDO, comOpsHouseVO);
Long userId = comOpsHouseDO.getUserId();
- LoginUserInfoVO loginUserInfoVO=comOpsHouseDAO.selectUserByUserId(userId);
+ LoginUserInfoVO loginUserInfoVO = comOpsHouseDAO.selectUserByUserId(userId);
comOpsHouseVO.setUserName(loginUserInfoVO.getName());
return R.ok(comOpsHouseVO);
}
+ /**
+ * 房屋租售-修改
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
+ */
@Override
+ @Transactional(rollbackFor = Exception.class)
public R putHouse(ComOpsHouseVO comOpsHouseVO) {
- ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
- BeanUtils.copyProperties(comOpsHouseVO,comOpsHouseDO);
+ ComOpsHouseDO comOpsHouseDO = new ComOpsHouseDO();
+ BeanUtils.copyProperties(comOpsHouseVO, comOpsHouseDO);
comOpsHouseDAO.updateById(comOpsHouseDO);
return R.ok();
}
@@ -76,13 +89,26 @@
/**
* 房屋租售-删除
*
- * @param id 主键
+ * @param id
+ * 主键
* @return 删除结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R deleteHouse(Long id) {
+ if (id == null) {
+ return R.fail("参数错误");
+ }
+ ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(id);
+ if (oldComOpsHouseDO == null) {
+ return R.fail("该房屋租售信息不存在");
+ }
+ if (oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())) {
+ return R.fail("该房屋租售信息不可删除,请刷新");
+ }
+
int delete = comOpsHouseDAO.deleteById(id);
- if (delete>0) {
+ if (delete > 0) {
return R.ok();
}
return R.fail();
@@ -91,7 +117,8 @@
/**
* 房屋租售-分页查询
*
- * @param pageComOpsHouseDTO 查询参数
+ * @param pageComOpsHouseDTO
+ * 查询参数
* @return ComOpsHouseVO
*/
@Override
@@ -99,17 +126,17 @@
Page page = new Page<>();
Long pageNum = pageComOpsHouseDTO.getPageNum();
Long pageSize = pageComOpsHouseDTO.getPageSize();
- if (null==pageNum||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null==pageSize||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserRealName())){
- Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserRealName());
- if (userId==null){
+ if (!StringUtils.isEmpty(pageComOpsHouseDTO.getUserName())) {
+ Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserName());
+ if (userId == null) {
userId = -1L;
}
pageComOpsHouseDTO.setUserId(userId);
@@ -119,4 +146,56 @@
}
+ /**
+ * 房屋租售-上下架
+ *
+ * @param comOpsHouseVO
+ * 上下架参数
+ * @return 上下架结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R undercarriageHouse(ComOpsHouseUndercarriageVO comOpsHouseVO) {
+
+ // 判断当前房屋租售信息状态
+ ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId());
+ if (oldComOpsHouseDO == null) {
+ return R.fail("该房屋租售信息不存在");
+ }
+ if (oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())) {
+ return R.fail("该房屋租售信息不可修改,请刷新");
+ }
+
+ BeanUtils.copyProperties(comOpsHouseVO, oldComOpsHouseDO);
+ comOpsHouseDAO.updateById(oldComOpsHouseDO);
+ 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