From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 613d172..8214ad8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -51,9 +51,19 @@
         ComActActivityDO comActActivityDO=new ComActActivityDO();
         BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
         Integer status = comActActivityVO.getStatus();
+        Date now = new Date();
         if (status.intValue()!=1) {
-            comActActivityDO.setPublishAt(new Date());//发布时间
+            comActActivityDO.setPublishAt(now);//发布时间
         }
+        //如果发布时间大于现在时间状态改为进行中
+        /*if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
+            comActActivityDO.setStatus(3);
+        }*/
+        //结束时间大于当前时间则设置为“进行中”
+        if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
+            comActActivityDO.setStatus(4);
+        }
+
         boolean save = this.save(comActActivityDO);
         if(!save){
             return R.fail();
@@ -73,6 +83,12 @@
     public R putActivity(ComActActivityVO comActActivityVO) {
         ComActActivityDO comActActivityDO=new ComActActivityDO();
         BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
+
+        //结束时间大于当前时间则设置为“进行中”
+        Date now = new Date();
+        if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
+            comActActivityDO.setStatus(4);
+        }
         boolean b = this.updateById(comActActivityDO);
         if (b) {
             return R.ok();
@@ -396,6 +412,8 @@
         return R.ok(indexDataVO);
     }
 
+
+
     /**
      * 获取最近七天的时间
      * @return

--
Gitblit v1.7.1