From eec7596638fa4d370bc7a867481f8dc000d26edf Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 17 八月 2023 16:22:28 +0800
Subject: [PATCH] 新增小程序最美志愿者列表接口

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 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..afb173f 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,11 +7,16 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
+import cn.hutool.core.util.StrUtil;
 import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.common.constants.Constants;
 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 io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -296,28 +301,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 +321,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);
                         }
                     }
                 });
@@ -415,8 +400,11 @@
     public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
         // 微信内容审核
         String msg = sysUserFeedbackDTO.getContent();
-        if (!checkService.checkMessage(msg)) {
-            return R.fail("内容违规");
+        if (StrUtil.isNotBlank(msg)) {
+            String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+            if (StrUtil.isNotBlank(result)) {
+                return R.fail(501, "填写内容存在 " + result + " 违规信息");
+            }
         }
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long userId = loginUserInfo.getUserId();
@@ -530,4 +518,31 @@
         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);
+    }
+
+    @ApiOperation("获取用户")
+    @GetMapping("selectAutomessageSysUserById")
+    public R selectAutomessageSysUserById(@RequestParam("id")Long id){
+        return communityService.selectAutomessageSysUserById(id);
+    }
+
+    @ApiOperation("新增投诉建议或问题留言")
+    @PostMapping("addFeedBack")
+    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+        sysUserFeedbackDTO.setCommunityId(null);
+        return userService.addFeedback(sysUserFeedbackDTO);
+    }
+
+    @ApiOperation("查看自己的投诉建议或问题留言记录")
+    @GetMapping("myFeedBack")
+    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
+        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
+    }
+
 }

--
Gitblit v1.7.1