puhanshu
2022-04-14 7bfa6a85ad6a6c537b0f7ddb9f6a8795c8e8c866
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -12,8 +12,10 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -305,14 +307,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,14 +338,16 @@
                    } else {
                        comActActivityVO.setActivitySignInList(currentList);
                    }
                    if(comActActivityVO.getType()==3){
                        if(comActActivityVO.getSignCount()==currentList.size()||currentList.get(collect.size()).getEndTime()!=null){
                            comActActivityVO.setIsRegist(1);
                    if(comActActivityVO.getLimit()>0&&currentList.size()>0){
                        if(comActActivityVO.getType()==3){
                            if(comActActivityVO.getLimit()==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
                                comActActivityVO.setIsRegist(1);
                            }
                        }
                    }
                    else {
                        if(comActActivityVO.getSignCount()==currentList.size()){
                            comActActivityVO.setIsRegist(1);
                        else {
                            if(comActActivityVO.getLimit()==currentList.size()){
                                comActActivityVO.setIsRegist(1);
                            }
                        }
                    }
                });
@@ -521,4 +540,11 @@
        userArchivesVO.setUserId(userId);
        return userService.updateUserArchives(userArchivesVO);
    }
    @ApiOperation(value = "分页查询用户报名的项目")
    @PostMapping("project")
    public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
        pageProjectDTO.setUserId(this.getUserId());
        return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
    }
}