From 31843345b78ac51c6f4d7da030e81764a4e962d0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 三月 2022 11:01:32 +0800
Subject: [PATCH] 党员认证Bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 414c2d4..4664598 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,12 +305,31 @@
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());
+ }
+ else {
+ comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+ comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+ }
}
});
if (currentList.size() > 10) {
comActActivityVO.setActivitySignInList(currentList.subList(0, 10));
} 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);
+ }
}
});
}
@@ -323,6 +342,7 @@
if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
comActActivityVO.setIsComment(0);
}
+ comActActivityVO.setComActActEvaluateVOList(evaluateVOS);
});
}
return R.ok(collect);
@@ -415,7 +435,7 @@
}
// 判断用户是否已认证成功
- R certUser = partyBuildingService.userCertification(userId);
+ R certUser = partyBuildingService.userCertification(userId,communityId);
Object certUserInfo = certUser.getData();
AtomicBoolean userCertified = new AtomicBoolean(false);
@@ -450,6 +470,7 @@
} else {
partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
partyBuildingMemberVO.setName(loginUserInfo.getName());
+ partyBuildingMemberVO.setPhone(loginUserInfo.getPhone());
}
R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
@@ -462,7 +483,7 @@
// 党员认证查询
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
- R r = partyBuildingService.userCertification(userId);
+ R r = partyBuildingService.userCertification(userId,this.getCommunityId());
if (R.isOk(r)) {
List<PartyBuildingMemberVO> partyBuildingMemberVOList =
--
Gitblit v1.7.1