From 72cc6d4d7b5c15a7c05cd4ab3c27e5fe23f5c4fe Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 16 三月 2022 17:04:23 +0800
Subject: [PATCH] 党员认证Bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 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 0a6de9d..158b573 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
@@ -279,11 +279,11 @@
         if (R.isOk(r)&&r.getData()!=null) {
             comActActivityVOS = (List<ComActActivityVO>)r.getData();
         }
-        R r1 = partyBuildingService.listActivity(userId, communityId, status);
-        if (R.isOk(r1)&&r1.getData()!=null) {
-            List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
-            comActActivityVOS.addAll(data);
-        }
+//        R r1 = partyBuildingService.listActivity(userId, communityId, status);
+//        if (R.isOk(r1)&&r1.getData()!=null) {
+//            List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
+//            comActActivityVOS.addAll(data);
+//        }
         if (!ObjectUtils.isEmpty(comActActivityVOS)) {
             String s = JSONArray.toJSONString(comActActivityVOS);
             List<ComActActivityVO> comActActivityVOS1 = new ArrayList<>();
@@ -305,6 +305,15 @@
                     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) {
@@ -318,11 +327,13 @@
             R r3 = communityService.listEvaluate(userId);
             if (R.isOk(r3) && !ObjectUtils.isEmpty(r3.getData())) {
                 List<ComActActEvaluateVO> comActActEvaluateVOS = JSONArray.parseArray(JSONArray.toJSONString(r3.getData()), ComActActEvaluateVO.class);
-                collect.forEach(comActActivityVO -> comActActEvaluateVOS.forEach(comActActEvaluateVO -> {
-                    if (comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())) {
-                        comActActivityVO.setMyRating(comActActEvaluateVO.getStarLevel());
-                    }
-                }));
+                collect.forEach(comActActivityVO -> {
+                 List<ComActActEvaluateVO> evaluateVOS=comActActEvaluateVOS.stream().filter(comActActEvaluateVO -> comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())).collect(toList());
+                 if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
+                     comActActivityVO.setIsComment(0);
+                 }
+                 comActActivityVO.setComActActEvaluateVOList(evaluateVOS);
+                });
             }
             return R.ok(collect);
         }
@@ -414,7 +425,7 @@
         }
 
         // 判断用户是否已认证成功
-        R certUser = partyBuildingService.userCertification(userId);
+        R certUser = partyBuildingService.userCertification(userId,communityId);
 
         Object certUserInfo = certUser.getData();
         AtomicBoolean userCertified = new AtomicBoolean(false);
@@ -449,6 +460,7 @@
         } else {
             partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
             partyBuildingMemberVO.setName(loginUserInfo.getName());
+            partyBuildingMemberVO.setPhone(loginUserInfo.getPhone());
         }
 
         R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
@@ -461,7 +473,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