From e78ad81dc4c63e81b21e1f3e6d5a456c655d8c62 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 05 八月 2022 10:10:23 +0800
Subject: [PATCH] 活动积分修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 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 ecc4684..74d58fe 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
@@ -7,9 +7,11 @@
 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;
@@ -293,30 +295,50 @@
                         .sorted(Comparator.comparing(ComActActRegistVO::getCreateAt).reversed()).collect(toList());
                 collect.forEach(comActActivityVO -> {
                     ArrayList<ComActActRegistVO> currentList = new ArrayList<>();
+                    Integer[] rewardWayArr = {0};
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            if(comActActivityVO.getType()!=3){
+
+                            Integer signIdentity = activitySignInVO.getSignIdentity();
+                            Integer rewardWay = null;
+                            Integer rewardIntegral = 0;
+                            switch (signIdentity) {
+                                case 1:
+                                    rewardWay = comActActivityVO.getParticipantRewardWay();
+                                    rewardIntegral = comActActivityVO.getParticipantRewardIntegral();
+                                    break;
+                                case 2:
+                                    rewardWay = comActActivityVO.getPbRewardWay();
+                                    rewardIntegral = comActActivityVO.getPbRewardIntegral();
+                                case 3:
+                                    rewardWay = comActActivityVO.getVolunteerRewardWay();
+                                    rewardIntegral = comActActivityVO.getVolunteerRewardIntegral();
+                                    break;
+                                default:
+                                    break;
+                            }
+                            rewardWayArr[0] = rewardWay;
+                            if(rewardWay == 1){
                                 comActActivityVO.setIsComment(1);
                                 if(comActActivityVO.getTimes()==null){
                                     comActActivityVO.setTimes(1);
-                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                                    comActActivityVO.setAward(rewardIntegral);
                                 }
                                 else {
                                     comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
-                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                    comActActivityVO.setAward(rewardIntegral*comActActivityVO.getTimes());
                                 }
-                            }
-                            else {
+                            } else {
                                 if(activitySignInVO.getEndTime()!=null){
                                     comActActivityVO.setIsComment(1);
                                     if(comActActivityVO.getTimes()==null){
                                         comActActivityVO.setTimes(1);
-                                        comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                                        comActActivityVO.setAward(activitySignInVO.getAward());
                                     }
                                     else {
                                         comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
-                                        comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                        comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
                                     }
                                 }
                             }
@@ -329,12 +351,11 @@
                     }
                     Integer limit = comActActivityVO.getLimit();
                     if(limit != null && limit>0 &&currentList.size()>0){
-                        if(comActActivityVO.getType()==3){
+                        if(rewardWayArr[0] == 2){
                             if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                                 comActActivityVO.setIsRegist(1);
                             }
-                        }
-                        else {
+                        } else {
                             if(limit==currentList.size()){
                                 comActActivityVO.setIsRegist(1);
                             }
@@ -530,4 +551,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