From 5aec730a4be904b0bc8225a80bdfcfebb1346a74 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 12 五月 2022 10:26:21 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index c452c25..8324dee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -305,8 +305,8 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            comActActivityVO.setIsComment(1);
                             if(comActActivityVO.getType()!=3){
+                                comActActivityVO.setIsComment(1);
                                 if(comActActivityVO.getTimes()==null){
                                     comActActivityVO.setTimes(1);
                                     comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
@@ -318,6 +318,7 @@
                             }
                             else {
                                 if(activitySignInVO.getEndTime()!=null){
+                                    comActActivityVO.setIsComment(1);
                                     if(comActActivityVO.getTimes()==null){
                                         comActActivityVO.setTimes(1);
                                         comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
@@ -335,14 +336,15 @@
                     } else {
                         comActActivityVO.setActivitySignInList(currentList);
                     }
-                    if(comActActivityVO.getLimit()>0){
+                    Integer limit = comActActivityVO.getLimit();
+                    if(limit != null && limit>0 &&currentList.size()>0){
                         if(comActActivityVO.getType()==3){
-                            if(comActActivityVO.getLimit()==currentList.size()||currentList.get(collect.size()).getEndTime()!=null){
+                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                                 comActActivityVO.setIsRegist(1);
                             }
                         }
                         else {
-                            if(comActActivityVO.getLimit()==currentList.size()){
+                            if(limit==currentList.size()){
                                 comActActivityVO.setIsRegist(1);
                             }
                         }

--
Gitblit v1.7.1