From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 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..b48296f 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
@@ -2,31 +2,24 @@
 
 import static java.util.stream.Collectors.toList;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
+import com.panzhihua.applets.umf.UmfPayUtil;
 import com.panzhihua.common.constants.HttpStatus;
+import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.utlis.DateUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -305,12 +298,29 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
+                            if(activitySignInVO.getEndTime()!=null){
+                                comActActivityVO.setIsComment(1);
+                                if(comActActivityVO.getTimes()==null){
+                                    comActActivityVO.setTimes(1);
+                                    comActActivityVO.setAward(activitySignInVO.getAward());
+                                }
+                                else {
+                                    comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+                                    comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
+                                }
+                            }
                         }
                     });
                     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(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
+                            comActActivityVO.setIsRegist(1);
+                        }
                     }
                 });
             }
@@ -323,6 +333,7 @@
                  if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
                      comActActivityVO.setIsComment(0);
                  }
+                 comActActivityVO.setComActActEvaluateVOList(evaluateVOS);
                 });
             }
             return R.ok(collect);
@@ -415,7 +426,7 @@
         }
 
         // 判断用户是否已认证成功
-        R certUser = partyBuildingService.userCertification(userId);
+        R certUser = partyBuildingService.userCertification(userId,communityId);
 
         Object certUserInfo = certUser.getData();
         AtomicBoolean userCertified = new AtomicBoolean(false);
@@ -450,6 +461,7 @@
         } else {
             partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
             partyBuildingMemberVO.setName(loginUserInfo.getName());
+            partyBuildingMemberVO.setPhone(loginUserInfo.getPhone());
         }
 
         R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
@@ -462,7 +474,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 =
@@ -500,4 +512,11 @@
         userArchivesVO.setUserId(userId);
         return userService.updateUserArchives(userArchivesVO);
     }
+
+    @ApiOperation(value = "分页查询用户报名的项目")
+    @PostMapping("project")
+    public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
+        pageProjectDTO.setUserId(this.getUserId());
+        return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
+    }
 }

--
Gitblit v1.7.1