套系上架，藏品不能新增

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PostCollectionsController.java

@@ -74,7 +74,7 @@ public class PostCollectionsController extends BaseController
         if (postCollectionsService.selectPostCollectionsByName(postCollectionsVo) > 0){
             return warn("该套系名称已存在");
         }
-        return toAjax(postCollectionsService.insertPostCollections(postCollectionsVo));
+        return postCollectionsService.insertPostCollections(postCollectionsVo);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/IPostCollectionsService.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.vo.PostCollectionsVo;
 import com.ruoyi.system.domain.PostCollections;
 
@@ -35,7 +36,7 @@ public interface IPostCollectionsService
      * @param postCollectionsVo 藏品
      * @return 结果
      */
-    public int insertPostCollections(PostCollectionsVo postCollectionsVo);
+    public AjaxResult insertPostCollections(PostCollectionsVo postCollectionsVo);
 
     /**
      * 修改藏品

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PostCollectionsServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.PostCollectionsSystem;
 import com.ruoyi.system.domain.vo.PostCollectionsVo;
@@ -68,7 +69,7 @@ public class PostCollectionsServiceImpl implements IPostCollectionsService
      * @return 结果
      */
     @Override
-    public int insertPostCollections(PostCollectionsVo postCollectionsVo)
+    public AjaxResult insertPostCollections(PostCollectionsVo postCollectionsVo)
     {
         //获取此藏品套系status
         Long systemId = postCollectionsVo.getSystemId();
@@ -76,21 +77,22 @@ public class PostCollectionsServiceImpl implements IPostCollectionsService
         //判断藏品套系是否上架，如果没上架，令藏品也未上架
         if (Objects.equals(postCollectionsSystemStatus, "0")){
             postCollectionsVo.setStatus("4");//未上架
+            postCollectionsVo.setCreateBy(getUsername());
+            postCollectionsVo.setUpdateBy(getUsername());
+            postCollectionsVo.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+            postCollectionsVo.setCreateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+            //通过发行方的名字查询id存进数据库
+            postCollectionsVo.setSystemId(postCollectionsVo.getSystemId());
+            postCollectionsVo.setIssuerId(iIssuerService.selectIssuerByIdForIssuerName(postCollectionsVo.getIssuerName()));
+
+            return AjaxResult.success(postCollectionsMapper.insertPostCollections(postCollectionsVo));
         }
         //如果套系已上架，判断以下时间线
         else {
-            //抽出一个工具类
-            CollectionStatusJudgment.JudgmentTime(postCollectionsVo);
+            //上架藏品不能新增
+            return AjaxResult.error("此套系已上架，不能新增藏品");
         }
-        postCollectionsVo.setCreateBy(getUsername());
-        postCollectionsVo.setUpdateBy(getUsername());
-        postCollectionsVo.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
-        postCollectionsVo.setCreateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
-        //通过发行方的名字查询id存进数据库
-        postCollectionsVo.setSystemId(postCollectionsVo.getSystemId());
-        postCollectionsVo.setIssuerId(iIssuerService.selectIssuerByIdForIssuerName(postCollectionsVo.getIssuerName()));
 
-        return postCollectionsMapper.insertPostCollections(postCollectionsVo);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/utils/CollectionStatusJudgment.java

@@ -77,7 +77,7 @@ public class CollectionStatusJudgment {
 
     /**
      * 如果未上架，令藏品状态为未上架
-     *
+     * 如果已上架，根据时间线判断藏品状态
      * @param systemId
      * @return 结果
      */