调整房源状态

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

@@ -52,7 +52,7 @@ public class TmHouse implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "状态: 0 -> 草稿;1->待审核;2->已审核;3->未通过")
     private Integer status;
 
     @ApiModelProperty(value = "审核记录ID")

src/main/java/fcb/project/manager/base/enums/HouseStatus.java

@@ -0,0 +1,44 @@
+package fcb.project.manager.base.enums;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/15 12:08
+ * 4
+ */
+public enum  HouseStatus {
+
+      DRAFT(0 , "草稿"),
+      WAITING_AUDIT(1 , "待审核"),
+      AUDITED(2 , "已审核"),
+      REJECT(3 , "未通过"),
+
+    ;
+
+    HouseStatus(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+
+    public static boolean canDelete(int status){
+        if(DRAFT.getCode().compareTo(status) == 0 || REJECT.getCode().compareTo(status) == 0){
+            return true;
+        }
+        return false;
+    }
+
+
+
+
+
+    private Integer code;
+    private String desc;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

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

@@ -5,6 +5,7 @@ import fcb.project.manager.base.entity.TmAudit;
 import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.entity.TmHouse;
 import fcb.project.manager.base.enums.DeleteStatus;
+import fcb.project.manager.base.enums.HouseStatus;
 import fcb.project.manager.base.service.impl.TmAuditServiceImpl;
 import fcb.project.manager.base.service.impl.TmEstateServiceImpl;
 import fcb.project.manager.base.service.impl.TmHouseServiceImpl;
@@ -117,6 +118,8 @@ public class HouseManagerController {
             log.info("{}楼盘下面的房源{}已经存在" , tmHouse.getEstateId() , tmHouse.getHouseTitle());
             throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘已经存在，无需再添加");
         }
+        //创建默认是草稿的状态
+        tmHouse.setStatus(0);
         if(tmHouseService.insertNew(tmHouse)){
             return Result.success("新增成功");
         }else{
@@ -152,6 +155,17 @@ public class HouseManagerController {
         if(StringUtils.isBlank(houseId)){
             return Result.failure("房源ID不能为空");
         }
+        TmHouse dbHouse = tmHouseService.getById(houseId);
+        if(null == dbHouse){
+            return Result.failure("房源不存在，无需删除");
+        }
+        if(null != dbHouse.getStatus()){
+            //除了草稿、未通过状态，其他状态都不能删除
+            if(!HouseStatus.canDelete(dbHouse.getStatus())){
+                  return Result.failure("存在待审核/已审核数据，无法删除");
+            }
+        }
+
         int delete = tmHouseService.deleteHouseById(houseId);
         if(delete != 1){
             return Result.failure("删除失败");
@@ -172,6 +186,9 @@ public class HouseManagerController {
             return Result.failure("id不能为空");
         }
         TmHouse dbHouse = tmHouseService.getById(tmHouse.getId());
+        if(null == dbHouse){
+            return Result.failure("房源不存在");
+        }
         if(tmHouseService.updateHouse(tmHouse)){
             return Result.success("修改成功");
         }else{
@@ -191,9 +208,14 @@ public class HouseManagerController {
             return Result.failure("房源ID不能为空");
         }
         TmHouse dbHouse = tmHouseService.getById(houseId);
-        if(null == dbHouse){
-            return Result.failure("房源不存在");
+        if(null == dbHouse || null == dbHouse.getStatus()){
+            return Result.failure("房源不存在或者房源状态非法");
         }
+
+        if(HouseStatus.AUDITED.getCode().compareTo(dbHouse.getStatus()) == 0){
+            return Result.failure("房源已审核");
+        }
+
         if(StringUtils.isBlank(dbHouse.getEstateId())){
             return Result.failure("房源未分配所属的楼盘不存在");
         }
@@ -223,7 +245,7 @@ public class HouseManagerController {
 
 
     @PostMapping("/dismissAudit")
-    @ApiOperation(value = "撤销审核记录")
+    @ApiOperation(value = "撤销审核记录-")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "houseId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
     })