调整

src/main/java/fcb/project/manager/base/entity/TmAudit.java

@@ -3,6 +3,8 @@ package fcb.project.manager.base.entity;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -84,6 +86,7 @@ public class TmAudit implements Serializable {
 
     @ApiModelProperty(value = "是否删除: 0->未删除; 1->已删除")
     @TableField("isDelete")
+    @TableLogic
     private Integer isDelete;
 
     @ApiModelProperty(value = "场景链接")

src/main/java/fcb/project/manager/base/entity/TmOperation.java

@@ -3,6 +3,8 @@ package fcb.project.manager.base.entity;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,6 +68,7 @@ public class TmOperation implements Serializable {
 
     @ApiModelProperty(value = "是否删除: 0->未删除; 1->已删除")
     @TableField("isDelete")
+    @TableLogic
     private Integer isDelete;
 
 

src/main/java/fcb/project/manager/base/service/impl/TmAuditServiceImpl.java

@@ -67,6 +67,15 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
         return getBaseMapper().updateById(tmAudit);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteAudit(String id){
+        if(StringUtils.isBlank(id)){
+            return -1;
+        }
+
+        return getBaseMapper().deleteById(id);
+    }
+
     public TmAudit selectForUpdate(String id){
         LambdaQueryWrapper<TmAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmAudit::getId , id);

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -70,9 +70,6 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     }
 
 
-    public TmHouse getById(String id){
-        return getBaseMapper().selectById(id);
-    }
 
     @Transactional(rollbackFor =  Exception.class)
     public boolean updateHouse(TmHouse tmHouse){
@@ -84,7 +81,7 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
             return false;
         }
         tmHouse.setUpdateTime(LocalDateTime.now());
-        return saveOrUpdate(tmHouse);
+        return 1 == getBaseMapper().updateById(tmHouse);
     }
 
     public TmHouse selectForUpdate(String id){

src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -19,6 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 2 * @Author: Abner
  * 3 * @Date: 2021/1/8 11:19
@@ -100,8 +103,9 @@ public class AuditController {
         if(update != 1){
            throw new CommonBaseException(ResultCodeEnum.D101 , "更新审核记录失败");
         }
-
-        return Result.failure("审核失败");
+        Map<String , Object> resMap = new HashMap<>();
+        resMap.put("auditId" , tmAudit.getId());
+        return Result.success("审核成功" , resMap);
     }
 
     @PostMapping("/online")

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -70,13 +70,30 @@ public class HouseManagerController {
                 resultPage.getCurrent(), resultPage.getRecords()));
     }
 
+    @GetMapping("/getHouseDetail")
+    @ApiOperation(value = "根据房源ID获取房源详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
+    })
+    public Result<Object> getHouseDetail(@RequestParam(required = true) String houseId){
+        if(StringUtils.isBlank(houseId)){
+            return Result.failure("房源ID不能为空");
+        }
+        TmHouse tmHouse = tmHouseService.getById(houseId);
+        if(null == tmHouse || tmHouse.getIsDelete().compareTo(1) == 0){
+            return Result.failure("房源不存在");
+        }
+        return Result.success(tmHouse);
+
+    }
+
 
     @GetMapping("/getEstateDetail")
     @ApiOperation(value = "根据楼盘ID获取楼盘详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "estateId", value = "楼盘ID", paramType = "query", required = true, dataType = "String"),
     })
-    public Result<Object> getHouseList(@RequestParam(required = true) String estateId){
+    public Result<Object> getEstateDetail(@RequestParam(required = true) String estateId){
         if(StringUtils.isBlank(estateId)){
             return Result.failure("楼盘ID不能为空");
         }
@@ -219,7 +236,7 @@ public class HouseManagerController {
         if(null == dbHouse || null == dbHouse.getAuditId()){
             return Result.failure("房源不存在或者未提交审核");
         }
-        dbHouse = null;
+//        dbHouse = null;
         //抢房源的锁，去掉原来审核的
         dbHouse = tmHouseService.selectForUpdate(houseId);
         if(null == dbHouse){
@@ -239,17 +256,16 @@ public class HouseManagerController {
         }
         //走到这里，说明审核的锁已经抢到了
         //两个锁都抢到了，则可以开始做撤销动作了
-        dbHouse.setAuditId(null);
-        dbHouse.setAuditorId(null);
-        dbHouse.setAuditorName(null);
+        dbHouse.setAuditId("");
+        dbHouse.setAuditorId("");
+        dbHouse.setAuditorName("");
         dbHouse.setAuditTime(null);
         if(!tmHouseService.updateHouse(dbHouse)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "撤销房源的审批记录失败");
         }
 
-        tmAudit.setIsDelete(DeleteStatus.HAS_DELETE.getCode());
-        int updateAudit = tmAuditService.updateAudit(tmAudit);
-        if(updateAudit != 1){
+        int deleteAudit = tmAuditService.deleteAudit(tmAudit.getId());
+        if(deleteAudit != 1){
             throw new CommonBaseException(ResultCodeEnum.D101 , "删除审批记录失败");
         }
 

src/main/resources/application-test.properties

@@ -19,7 +19,7 @@ swagger.page.packagePath=fcb.project.manager
 
 
 spring.redis.cluster.max-redirects=3
-spring.redis.cluster.nodes=10.1.152.54:6379,
+spring.redis.cluster.nodes=127.0.0.1:6379
 spring.redis.timeout=5000ms
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-idle=8

src/main/resources/application.properties

@@ -1,8 +1,8 @@
 
 
 #spring.profiles.active=prod
-spring.profiles.active=dev
-#spring.profiles.active=test
+#spring.profiles.active=dev
+spring.profiles.active=test
 
 #应用名
 spring.application.name=fbc-project-manager