活动相关修改-用户端涉及到的校验及时间处理都修改成年月日时分秒

alien-store/src/main/java/shop/alien/store/service/impl/StoreOperationalActivityAchievementServiceImpl.java

@@ -23,8 +23,6 @@ import shop.alien.mapper.storePlantform.StoreOperationalActivityAchievementMappe
 import shop.alien.mapper.storePlantform.StoreOperationalActivityMapper;
 import shop.alien.store.dto.StoreOperationalActivityAchievementDto;
 import shop.alien.store.service.StoreOperationalActivityAchievementService;
-import shop.alien.util.common.DateUtils;
-
 /**
  * 运营活动成果服务实现
  *
@@ -58,8 +56,8 @@ public class StoreOperationalActivityAchievementServiceImpl implements StoreOper
         if (activity == null) {
             throw new IllegalArgumentException("活动不存在");
         }
-        Date nowDay = DateUtils.toDateOnly(new Date());
-        if (activity.getStartTime() != null && nowDay.before(DateUtils.toDateOnly(activity.getStartTime()))) {
+        Date now = new Date();
+        if (activity.getStartTime() != null && now.before(activity.getStartTime())) {
             throw new IllegalArgumentException("活动未开始，不允许新增成果");
         }
 

alien-store/src/main/java/shop/alien/store/service/impl/StoreOperationalActivityServiceImpl.java

@@ -32,7 +32,6 @@ import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.config.WebSocketProcess;
 import shop.alien.store.dto.StoreOperationalActivitySignupDto;
 import shop.alien.store.service.StoreOperationalActivityService;
-import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.Constants;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
@@ -323,11 +322,11 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
         if (status == null || (status != 2 && status != 5)) {
             throw new IllegalArgumentException("活动状态不允许报名");
         }
-        Date nowDay = DateUtils.toDateOnly(new Date());
-        if (activity.getSignupStartTime() != null && nowDay.before(DateUtils.toDateOnly(activity.getSignupStartTime()))) {
+        Date now = new Date();
+        if (activity.getSignupStartTime() != null && now.before(activity.getSignupStartTime())) {
             throw new IllegalArgumentException("未到报名时间");
         }
-        if (activity.getSignupEndTime() != null && nowDay.after(DateUtils.toDateOnly(activity.getSignupEndTime()))) {
+        if (activity.getSignupEndTime() != null && now.after(activity.getSignupEndTime())) {
             throw new IllegalArgumentException("报名已结束");
         }
 //        if (activity.getStartTime() != null && status == 5 && now.before(activity.getStartTime())) {
@@ -428,13 +427,13 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
         if (activity == null) {
             return false;
         }
-        Date nowDay = DateUtils.toDateOnly(new Date());
-        Date start = DateUtils.toDateOnly(activity.getSignupStartTime());
-        Date end = DateUtils.toDateOnly(activity.getSignupEndTime());
-        if (start != null && nowDay.before(start)) {
+        Date now = new Date();
+        Date start = activity.getSignupStartTime();
+        Date end = activity.getSignupEndTime();
+        if (start != null && now.before(start)) {
             return false;
         }
-        if (end != null && nowDay.after(end)) {
+        if (end != null && now.after(end)) {
             return false;
         }
         return true;
@@ -444,11 +443,11 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
         if (activity == null) {
             return null;
         }
-        Date nowDay = DateUtils.toDateOnly(new Date());
+        Date now = new Date();
         if (activity.getStatus() != null && activity.getStatus() == 7) {
             return 0;
         }
-        if (activity.getEndTime() != null && nowDay.after(DateUtils.toDateOnly(activity.getEndTime()))) {
+        if (activity.getEndTime() != null && now.after(activity.getEndTime())) {
             return 0;
         }
         Integer status = activity.getStatus();
@@ -456,10 +455,10 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
             return 1;
         }
         if (signupStatus != null && signupStatus == 2
-                && activity.getStartTime() != null && nowDay.before(DateUtils.toDateOnly(activity.getStartTime()))) {
+                && activity.getStartTime() != null && now.before(activity.getStartTime())) {
             return 2;
         }
-        if (activity.getSignupEndTime() != null && nowDay.after(DateUtils.toDateOnly(activity.getSignupEndTime()))) {
+        if (activity.getSignupEndTime() != null && now.after(activity.getSignupEndTime())) {
             if (status != null && status == 5 && signupStatus != null && signupStatus == 2) {
                 return 3;
             }
@@ -473,7 +472,7 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
                 return 4;
             }
             if (signupStatus == 1) {
-                if (activity.getSignupEndTime() != null && nowDay.before(DateUtils.toDateOnly(activity.getSignupEndTime()))) {
+                if (activity.getSignupEndTime() != null && now.before(activity.getSignupEndTime())) {
                     return 5;
                 }
                 return 1;
@@ -519,14 +518,14 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
         if (item == null) {
             return null;
         }
-        Date nowDay = DateUtils.toDateOnly(new Date());
+        Date now = new Date();
         Integer activityStatus = item.getActivityStatus();
         boolean hasAchievement = item.getHasAchievement() != null && item.getHasAchievement() == 1;
         Integer auditStatus = item.getSignupAuditStatus();
         Date startTime = item.getStartTime();
         Date endTime = item.getEndTime();
         boolean ended = (activityStatus != null && (activityStatus == 7 || activityStatus == 6))
-                || (endTime != null && nowDay.after(DateUtils.toDateOnly(endTime)));
+                || (endTime != null && now.after(endTime));
         if (ended) {
             return hasAchievement ? 2 : 1;
         }
@@ -548,7 +547,7 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
             }
         }
         if (auditStatus != null && auditStatus == 0
-                && startTime != null && !nowDay.after(DateUtils.toDateOnly(startTime))) {
+                && startTime != null && !now.after(startTime)) {
             return 7;
         }
         return null;