From 9346f597cc502a069679f01505594d8ca6e9f8d0 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 15 六月 2022 15:01:10 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 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..df531f7 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
@@ -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());
+ }
+ }
}
}
});
@@ -320,6 +337,18 @@
comActActivityVO.setActivitySignInList(currentList.subList(0, 10));
} else {
comActActivityVO.setActivitySignInList(currentList);
+ }
+ if(comActActivityVO.getLimit()>0&¤tList.size()>0){
+ if(comActActivityVO.getType()==3){
+ if(comActActivityVO.getLimit()==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
+ comActActivityVO.setIsRegist(1);
+ }
+ }
+ else {
+ if(comActActivityVO.getLimit()==currentList.size()){
+ comActActivityVO.setIsRegist(1);
+ }
+ }
}
});
}
@@ -511,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);
+ }
}
--
Gitblit v1.7.1