From 07e29422c8559295bd6a5594e6f95f9e08d0bc95 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 31 三月 2022 17:07:48 +0800
Subject: [PATCH] 党建bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 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 613df60..8324dee 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,13 +305,49 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            comActActivityVO.setIsComment(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) {
                         comActActivityVO.setActivitySignInList(currentList.subList(0, 10));
                     } else {
                         comActActivityVO.setActivitySignInList(currentList);
+                    }
+                    Integer limit = comActActivityVO.getLimit();
+                    if(limit != null && limit>0 &&currentList.size()>0){
+                        if(comActActivityVO.getType()==3){
+                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
+                                comActActivityVO.setIsRegist(1);
+                            }
+                        }
+                        else {
+                            if(limit==currentList.size()){
+                                comActActivityVO.setIsRegist(1);
+                            }
+                        }
                     }
                 });
             }
@@ -417,7 +453,7 @@
         }
 
         // 判断用户是否已认证成功
-        R certUser = partyBuildingService.userCertification(userId);
+        R certUser = partyBuildingService.userCertification(userId,communityId);
 
         Object certUserInfo = certUser.getData();
         AtomicBoolean userCertified = new AtomicBoolean(false);
@@ -452,6 +488,7 @@
         } else {
             partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
             partyBuildingMemberVO.setName(loginUserInfo.getName());
+            partyBuildingMemberVO.setPhone(loginUserInfo.getPhone());
         }
 
         R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
@@ -464,7 +501,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