From 76ed3735c23da4b7ef97b8a0f365facbc14f6903 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 27 六月 2021 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 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 25abdb6..ec4e3e0 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
@@ -14,6 +14,8 @@
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -273,6 +275,13 @@
      */
     @PostMapping("addeasyphoto")
     R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+    /**
+     * 查询随手拍是否有活动
+     * @return  活动详情
+     */
+    @PostMapping("getEasyPhotoActivity")
+    R getEasyPhotoActivity(@RequestParam("communityId") Long communityId);
 
     /**
      * 发布微心愿
@@ -3100,4 +3109,36 @@
      */
     @GetMapping("/population/repair")
     R getPopulationRepairByApp();
+
+    /**
+     * 工作大屏-社区动态模块数据统计
+     * @param communityId   社区id
+     * @return  社区动态数据统计
+     */
+    @GetMapping("/screen/work/dynamic")
+    R dynamicWork(@RequestParam("communityId")Long communityId);
+
+    /**
+     * 查询用户钱包信息
+     * @param walletDetailDTO   请求参数
+     * @return  用户钱包信息
+     */
+    @PostMapping("/wallet/get/my")
+    R getUserWalletDetail(@RequestBody ComActWalletDetailDTO walletDetailDTO);
+
+    /**
+     * 查询用户收支记录列表
+     * @param walletTradeDTO    请求参数
+     * @return  收支记录
+     */
+    @PostMapping("/wallet/get/trade")
+    R getUserWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+    /**
+     * 查询用户绑定的社区收益排行榜
+     * @param walletTradeDTO   请求参数
+     * @return  社区收益排行榜
+     */
+    @PostMapping("/wallet/get/ranking")
+    R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
 }

--
Gitblit v1.7.1