From 2b6c540c6b20e04f8b2a05e6f0c22ba5d5016364 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 14:09:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   39 ++++++++++++++-------------------------
 1 files changed, 14 insertions(+), 25 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 f3aacc8..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
@@ -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;
@@ -296,28 +298,15 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            if(comActActivityVO.getType()!=3&&comActActivityVO.getType()!=5){
+                            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());
-                                }
-                            }
-                            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());
-                                    }
+                                    comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
                                 }
                             }
                         }
@@ -329,15 +318,8 @@
                     }
                     Integer limit = comActActivityVO.getLimit();
                     if(limit != null && limit>0 &&currentList.size()>0){
-                        if(comActActivityVO.getType()==3||comActActivityVO.getType()==5){
-                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
-                                comActActivityVO.setIsRegist(1);
-                            }
-                        }
-                        else {
-                            if(limit==currentList.size()){
-                                comActActivityVO.setIsRegist(1);
-                            }
+                        if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
+                            comActActivityVO.setIsRegist(1);
                         }
                     }
                 });
@@ -530,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