From dfd80c77abd68b95a8fc1e832d36d6f756083e04 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 05 八月 2022 13:26:44 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   49 +++++--------------------------------------------
 1 files changed, 5 insertions(+), 44 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 74d58fe..b48296f 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
@@ -295,51 +295,18 @@
                         .sorted(Comparator.comparing(ComActActRegistVO::getCreateAt).reversed()).collect(toList());
                 collect.forEach(comActActivityVO -> {
                     ArrayList<ComActActRegistVO> currentList = new ArrayList<>();
-                    Integer[] rewardWayArr = {0};
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-
-                            Integer signIdentity = activitySignInVO.getSignIdentity();
-                            Integer rewardWay = null;
-                            Integer rewardIntegral = 0;
-                            switch (signIdentity) {
-                                case 1:
-                                    rewardWay = comActActivityVO.getParticipantRewardWay();
-                                    rewardIntegral = comActActivityVO.getParticipantRewardIntegral();
-                                    break;
-                                case 2:
-                                    rewardWay = comActActivityVO.getPbRewardWay();
-                                    rewardIntegral = comActActivityVO.getPbRewardIntegral();
-                                case 3:
-                                    rewardWay = comActActivityVO.getVolunteerRewardWay();
-                                    rewardIntegral = comActActivityVO.getVolunteerRewardIntegral();
-                                    break;
-                                default:
-                                    break;
-                            }
-                            rewardWayArr[0] = rewardWay;
-                            if(rewardWay == 1){
+                            if(activitySignInVO.getEndTime()!=null){
                                 comActActivityVO.setIsComment(1);
                                 if(comActActivityVO.getTimes()==null){
                                     comActActivityVO.setTimes(1);
-                                    comActActivityVO.setAward(rewardIntegral);
+                                    comActActivityVO.setAward(activitySignInVO.getAward());
                                 }
                                 else {
                                     comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
-                                    comActActivityVO.setAward(rewardIntegral*comActActivityVO.getTimes());
-                                }
-                            } else {
-                                if(activitySignInVO.getEndTime()!=null){
-                                    comActActivityVO.setIsComment(1);
-                                    if(comActActivityVO.getTimes()==null){
-                                        comActActivityVO.setTimes(1);
-                                        comActActivityVO.setAward(activitySignInVO.getAward());
-                                    }
-                                    else {
-                                        comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
-                                        comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
-                                    }
+                                    comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
                                 }
                             }
                         }
@@ -351,14 +318,8 @@
                     }
                     Integer limit = comActActivityVO.getLimit();
                     if(limit != null && limit>0 &&currentList.size()>0){
-                        if(rewardWayArr[0] == 2){
-                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
-                                comActActivityVO.setIsRegist(1);
-                            }
-                        } else {
-                            if(limit==currentList.size()){
-                                comActActivityVO.setIsRegist(1);
-                            }
+                        if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
+                            comActActivityVO.setIsRegist(1);
                         }
                     }
                 });

--
Gitblit v1.7.1