From fc70fad3cf843e6d2523c38fdd65fc48037f5fb6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 22 八月 2022 15:41:12 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   92 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index be80409..8f544d8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,6 +3,10 @@
 import java.util.List;
 
 import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
+import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
 import com.panzhihua.common.model.dtos.community.acid.*;
 import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
 import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
@@ -1633,12 +1637,12 @@
     /**
      * 议事投票-投票
      *
-     * @param comActDiscussOptionUserDTO
+     * @param discussVoteOptionDTO
      *            投票信息
      * @return 投票结果
      */
     @PostMapping("adddiscussoptionuser")
-    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
+    R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);
 
     /**
      * 议事投票-评论-点赞、取消点赞
@@ -5056,7 +5060,7 @@
      * @return 社区列表
      */
     @GetMapping("/eventgrid/community/westList")
-    R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
+    R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);
 
     /**
      * 综治app-小区列表
@@ -5349,14 +5353,23 @@
     R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
 
     /**
-     * 小程序-查询用户积分列表
+     * 小程序-积分统计
      *
      * @param userId
      *            用户id
      * @return 用户积分列表
      */
-    @PostMapping("/integral/user/list/applets")
-    R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+    @GetMapping("/integral/user/statistics")
+    R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam(value = "communityId", required = false) Long communityId);
+
+    /**
+     * 查询我的积分余额
+     * @param userId
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/integral/user/balance")
+    R getUserIntegralBalance(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
 
     /**
      * 小程序-查询社区积分账户排行榜
@@ -5649,6 +5662,9 @@
 
     @PostMapping("/reserve/commitNoToken")
     R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+    @PostMapping("/reserve/homeQuarantine/commitNoToken")
+    R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
     /**
      * 我的预约/登记
      * @param pageUserReserveDTO
@@ -10263,4 +10279,68 @@
      */
     @GetMapping("/comActEasyPhotoHandler/detail")
     R detailEasyPhotoHandler(@RequestParam("id") Long id);
+
+    /**
+     * 活动邀请列表
+     * @param pageActivityInviteDTO
+     * @return
+     */
+    @PostMapping("/activity/invite/list")
+    R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO);
+
+    /**
+     * 添加邀请人员
+     * @param list
+     * @return
+     */
+    @PostMapping("/activity/invite/add")
+    R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list);
+
+    /**
+     * 删除邀请人员
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/activity/invite/delete")
+    R activityInviteDelete(@RequestParam("id") Long id);
+
+    /**
+     * 获取积分详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/integral/user/detail")
+    R getUserIntegralDetail(@RequestParam("id") Long id);
+
+    /**
+     * 分页查询可关联清单列表
+     * @param neighborCircleAppDTO
+     * @return
+     */
+    @PostMapping("/neighbor/pageRelationList")
+    R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+    /**
+     * 投票情况-分页查询
+     * @param pageVoteSituationDTO
+     * @return
+     */
+    @PostMapping("pageVoteSituation")
+    R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO);
+
+    /**
+     * 投票情况详情
+     * @param optionUserId
+     * @return
+     */
+    @GetMapping("detailVoteSituation")
+    R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId);
+
+    /**
+     * 批量核对防疫信息数据
+     * @param batchCheckAcidRecordDTO
+     * @return
+     */
+    @PostMapping("/comActAcidRecord/batchCheck")
+    R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
 }

--
Gitblit v1.7.1