From 72270233ea0994de6728ae644fc209b207910f67 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 04 八月 2022 16:32:55 +0800
Subject: [PATCH] 活动积分修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 66 insertions(+), 29 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 4664598..ea221b6 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
@@ -2,31 +2,24 @@
import static java.util.stream.Collectors.toList;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.validation.Valid;
+import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.constants.HttpStatus;
+import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.utlis.DateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -302,17 +295,52 @@
.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);
- comActActivityVO.setIsComment(1);
- if(comActActivityVO.getTimes()==null){
- comActActivityVO.setTimes(1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+
+ 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.getVolunteerRewardWay();
+ rewardIntegral = comActActivityVO.getVolunteerRewardIntegral();
+ break;
+ case 3:
+ rewardWay = comActActivityVO.getPbRewardWay();
+ rewardIntegral = comActActivityVO.getPbRewardIntegral();
+ default:
+ break;
}
- else {
- comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+ rewardWayArr[0] = rewardWay;
+ if(rewardWay == 1){
+ comActActivityVO.setIsComment(1);
+ if(comActActivityVO.getTimes()==null){
+ comActActivityVO.setTimes(1);
+ comActActivityVO.setAward(rewardIntegral);
+ }
+ 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());
+ }
+ }
}
}
});
@@ -321,14 +349,16 @@
} else {
comActActivityVO.setActivitySignInList(currentList);
}
- if(comActActivityVO.getType()==3){
- if(comActActivityVO.getSignCount()==currentList.size()||currentList.get(collect.size()).getEndTime()!=null){
- comActActivityVO.setIsRegist(1);
- }
- }
- else {
- if(comActActivityVO.getSignCount()==currentList.size()){
- comActActivityVO.setIsRegist(1);
+ Integer limit = comActActivityVO.getLimit();
+ if(limit != null && limit>0 &¤tList.size()>0){
+ if(rewardWayArr[0] == 2){
+ if(limit==currentList.size()&¤tList.get(currentList.size()-1).getEndTime()!=null){
+ comActActivityVO.setIsRegist(1);
+ }
+ } else {
+ if(limit==currentList.size()){
+ comActActivityVO.setIsRegist(1);
+ }
}
}
});
@@ -521,4 +551,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