From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   61 ++++++++++--------------------
 1 files changed, 21 insertions(+), 40 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 0976896..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,28 +298,15 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            if(comActActivityVO.getType()!=3){
+                            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());
                                 }
                             }
                         }
@@ -336,16 +316,10 @@
                     } else {
                         comActActivityVO.setActivitySignInList(currentList);
                     }
-                    if(comActActivityVO.getLimit()>0&&currentList.size()>0){
-                        if(comActActivityVO.getType()==3){
-                            if(comActActivityVO.getLimit()==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
-                                comActActivityVO.setIsRegist(1);
-                            }
-                        }
-                        else {
-                            if(comActActivityVO.getLimit()==currentList.size()){
-                                comActActivityVO.setIsRegist(1);
-                            }
+                    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);
                         }
                     }
                 });
@@ -538,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