From 07e29422c8559295bd6a5594e6f95f9e08d0bc95 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 31 三月 2022 17:07:48 +0800
Subject: [PATCH] 党建bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 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 158b573..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,14 +305,29 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            comActActivityVO.setIsComment(1);
-                            if(comActActivityVO.getTimes()==null){
-                                comActActivityVO.setTimes(1);
-                                comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                            if(comActActivityVO.getType()!=3){
+                                comActActivityVO.setIsComment(1);
+                                if(comActActivityVO.getTimes()==null){
+                                    comActActivityVO.setTimes(1);
+                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                                }
+                                else {
+                                    comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                }
                             }
                             else {
-                                comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
-                                comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                if(activitySignInVO.getEndTime()!=null){
+                                    comActActivityVO.setIsComment(1);
+                                    if(comActActivityVO.getTimes()==null){
+                                        comActActivityVO.setTimes(1);
+                                        comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                                    }
+                                    else {
+                                        comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+                                        comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                    }
+                                }
                             }
                         }
                     });
@@ -321,6 +336,19 @@
                     } else {
                         comActActivityVO.setActivitySignInList(currentList);
                     }
+                    Integer limit = comActActivityVO.getLimit();
+                    if(limit != null && limit>0 &&currentList.size()>0){
+                        if(comActActivityVO.getType()==3){
+                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
+                                comActActivityVO.setIsRegist(1);
+                            }
+                        }
+                        else {
+                            if(limit==currentList.size()){
+                                comActActivityVO.setIsRegist(1);
+                            }
+                        }
+                    }
                 });
             }
             //当前用户活动评分

--
Gitblit v1.7.1