From 99409fcaa1d90230f0e5a4fc5d148c6d9e5554e5 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 04 八月 2022 10:04:40 +0800
Subject: [PATCH] 活动积分改版
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 c22306b..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
@@ -295,30 +295,50 @@
.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);
- if(comActActivityVO.getType()!=3&&comActActivityVO.getType()!=5){
+
+ 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;
+ }
+ rewardWayArr[0] = rewardWay;
+ if(rewardWay == 1){
comActActivityVO.setIsComment(1);
if(comActActivityVO.getTimes()==null){
comActActivityVO.setTimes(1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+ comActActivityVO.setAward(rewardIntegral);
}
else {
comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+ comActActivityVO.setAward(rewardIntegral*comActActivityVO.getTimes());
}
- }
- else {
+ } else {
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());
+ comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
}
}
}
@@ -331,12 +351,11 @@
}
Integer limit = comActActivityVO.getLimit();
if(limit != null && limit>0 &¤tList.size()>0){
- if(comActActivityVO.getType()==3||comActActivityVO.getType()==5){
+ if(rewardWayArr[0] == 2){
if(limit==currentList.size()&¤tList.get(currentList.size()-1).getEndTime()!=null){
comActActivityVO.setIsRegist(1);
}
- }
- else {
+ } else {
if(limit==currentList.size()){
comActActivityVO.setIsRegist(1);
}
--
Gitblit v1.7.1