添加套系和修改套系时间自动确认是在售预售过期的判断

ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostSeriesController.java

@@ -1,9 +1,12 @@
 package com.ruoyi.web.controller.post;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.post.domain.PostCollection;
 import com.ruoyi.post.service.IPostCollectionService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -67,6 +70,11 @@ public class PostSeriesController extends BaseController
         //通过匹配查询出对应的藏品
        postCollection.setSeriesName(seriesName);
        List<PostCollection> postCollections = postCollectionService.selectPostCollectionList(postCollection);
+       if(postCollections.isEmpty()){
+           List<String> list=new ArrayList<String>();
+           list.add(("当前"+postSeries.getSeriesName()+"套系不含有任何藏品"));
+           return getDataTable(list);
+       }
        return getDataTable(postCollections);
     }
 
@@ -144,6 +152,27 @@ public class PostSeriesController extends BaseController
             return AjaxResult.error("新增消息"+postSeries.getSeriesName()+"失败，套系已经存在");
         }
         postSeries.setCreateBy(getUsername());
+        /**
+         * 根据套系时间，自动识别套系藏品所在table“在售/预售/以过期”根据当前时间，
+         * 对比套系时间，当前小于套系时间，该套系藏品为“以过期”， 当前时间大于套系时间为“预售”
+         */
+        Date nowDate=new Date();
+        nowDate=DateUtils.getNowDate();
+        /**
+         * 展示时间 结束时间
+         * 当前时间大于结束时间  过期 2
+         * 当前时间在展示时间以及结束时间区间 在售 0
+         * 当前时间小于展示时间 预售 1
+         */
+        if(nowDate.compareTo(postSeries.getEndTime())>0){
+            postSeries.setStatus(String.valueOf(2));
+        }
+        else if (postSeries.getStartTime().compareTo(nowDate)>0){
+            postSeries.setStatus(String.valueOf(1));
+        }
+        else{
+           postSeries.setStatus(String.valueOf(0));
+        }
         return toAjax(postSeriesService.insertPostSeries(postSeries));
     }
 
@@ -155,6 +184,28 @@ public class PostSeriesController extends BaseController
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody PostSeries postSeries)
     {
+        if(UserConstants.NOT_UNIQUE.equals(postSeriesService.checkSeriesNameUnique(postSeries)))
+        {
+            return AjaxResult.error("修改消息"+postSeries.getSeriesName()+"失败，套系已经存在");
+        }
+        postSeries.setUpdateBy(getUsername());
+        Date nowDate=new Date();
+        nowDate=DateUtils.getNowDate();
+        /**
+         * 展示时间 结束时间
+         * 当前时间大于结束时间  过期 2
+         * 当前时间在展示时间以及结束时间区间 在售 0
+         * 当前时间小于展示时间 预售 1
+         */
+        if(nowDate.compareTo(postSeries.getEndTime())>0){
+            postSeries.setStatus(String.valueOf(2));
+        }
+        else if (postSeries.getStartTime().compareTo(nowDate)>0){
+            postSeries.setStatus(String.valueOf(1));
+        }
+        else{
+            postSeries.setStatus(String.valueOf(0));
+        }
         return toAjax(postSeriesService.updatePostSeries(postSeries));
     }
 

ruoyi-post/src/main/java/com/ruoyi/post/domain/PostSeries.java

@@ -31,11 +31,6 @@ public class PostSeries extends BaseEntity
     /** 藏品数量 */
     @Excel(name = "藏品数量")
     private Long collectionCounts;
-    /** 藏品的list*/
-    @Excel(name = "藏品的list")
-    private Long collectionArray;
-
-
 
     /** 套系状态（0在售 1预售 2已过期） */
     @Excel(name = "套系状态", readConverterExp = "0=在售,1=预售,2=已过期")
@@ -55,17 +50,11 @@ public class PostSeries extends BaseEntity
     @Excel(name = "展示时间末端", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /** 删除标志（0代表存在 1代表删除） */
     private String delFlag;
 
 
-    public Long getCollectionArray() {
-        return collectionArray;
-    }
 
-    public void setCollectionArray(Long collectionArray) {
-        this.collectionArray = collectionArray;
-    }
     public void setSeriesId(Long seriesId) 
     {
         this.seriesId = seriesId;
@@ -93,12 +82,12 @@ public class PostSeries extends BaseEntity
     {
         return collectionCounts;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
@@ -153,7 +142,6 @@ public class PostSeries extends BaseEntity
                 .append("seriesId", getSeriesId())
                 .append("seriesName", getSeriesName())
                 .append("seriesImage", getSeriesImage())
-                .append("collectionArray", getCollectionArray())
                 .append("collectionCounts", getCollectionCounts())
                 .append("status", getStatus())
                 .append("exchangeStatus", getExchangeStatus())

ruoyi-post/src/main/java/com/ruoyi/post/service/impl/PostSeriesServiceImpl.java

@@ -94,6 +94,7 @@ public class PostSeriesServiceImpl implements IPostSeriesService
     public int insertPostSeries(PostSeries postSeries)
     {
         postSeries.setCreateTime(DateUtils.getNowDate());
+
         return postSeriesMapper.insertPostSeries(postSeries);
     }