bug修改

101captain

2022-08-19 fca18d30a38e6f1559663db4cc69de785451f22c

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -298,28 +298,15 @@
                    comActActRegistVOS.forEach(activitySignInVO -> {
                        if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                            currentList.add(activitySignInVO);
                            if(comActActivityVO.getType()!=3&&comActActivityVO.getType()!=5){
                            if(activitySignInVO.getEndTime()!=null){
                                comActActivityVO.setIsComment(1);
                                if(comActActivityVO.getTimes()==null){
                                    comActActivityVO.setTimes(1);
                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
                                    comActActivityVO.setAward(activitySignInVO.getAward());
                                }
                                else {
                                    comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
                                }
                            }
                            else {
                                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());
                                    }
                                    comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
                                }
                            }
                        }
@@ -331,15 +318,8 @@
                    }
                    Integer limit = comActActivityVO.getLimit();
                    if(limit != null && limit>0 &&currentList.size()>0){
                        if(comActActivityVO.getType()==3||comActActivityVO.getType()==5){
                            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);
                        }
                    }
                });