From e49e433e26356856e431e993df2394e61bdb116b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 三月 2022 15:01:49 +0800
Subject: [PATCH] 党员认证Bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 e26f659..ead006f 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
@@ -305,8 +305,30 @@
comActActRegistVOS.forEach(activitySignInVO -> {
if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
currentList.add(activitySignInVO);
- comActActivityVO.setIsComment(1);
- comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+ 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 {
+ 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());
+ }
+ }
+ }
}
});
if (currentList.size() > 10) {
@@ -314,6 +336,18 @@
} else {
comActActivityVO.setActivitySignInList(currentList);
}
+ if(comActActivityVO.getLimit()>0){
+ if(comActActivityVO.getType()==3){
+ if(comActActivityVO.getLimit()==currentList.size()||currentList.get(collect.size()).getEndTime()!=null){
+ comActActivityVO.setIsRegist(1);
+ }
+ }
+ else {
+ if(comActActivityVO.getLimit()==currentList.size()){
+ comActActivityVO.setIsRegist(1);
+ }
+ }
+ }
});
}
//当前用户活动评分
--
Gitblit v1.7.1