From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +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 | 125 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 123 insertions(+), 2 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 67232db..9c6987c 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
@@ -13,8 +13,11 @@
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.community.easyPhoto.AddEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
+import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -3490,4 +3493,122 @@
*/
@PostMapping("/village/admin/export")
R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);
+
+ /**
+ * 社区后台-分页查询随手拍活动列表
+ * @param pageEasyPhotoActivityDTO 请求参数
+ * @return 随手拍活动列表
+ */
+ @PostMapping("/easy/photo/activity/page")
+ R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-添加随手拍活动
+ * @param addEasyPhotoActivityDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/easy/photo/activity/add")
+ R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-编辑随手拍活动
+ * @param editEasyPhotoActivityDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/easy/photo/activity/edit")
+ R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-取消随手拍活动
+ * @param id 随手拍活动id
+ * @return 取消结果
+ */
+ @GetMapping("/easy/photo/activity/cancel")
+ R cancelEasyPhotoActivity(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询随手拍活动下居民参与记录
+ * @param pageEasyPhotoActivityUserDTO 请求参数
+ * @return 居民参与记录
+ */
+ @PostMapping("/easy/photo/activity/page/user")
+ R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
+
+ /**
+ * 随手拍活动定时任务
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskEasyPhotoActivity")
+ R timedTaskEasyPhotoActivity();
+
+ /**
+ * 分页查询收益结算列表
+ * @param pageWalletAdminDTO 请求参数
+ * @return 收益结算列表
+ */
+ @PostMapping("/user/wallet/page")
+ R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);
+
+ /**
+ * 用户结算收益
+ * @param settlementAdminDTO 请求参数
+ * @return 结算结果
+ */
+ @PostMapping("/user/wallet/settlement")
+ R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);
+
+ /**
+ * 分页查询交易记录
+ * @param pageTradeAdminDTO 请求参数
+ * @return 交易记录列表
+ */
+ @PostMapping("/user/wallet/trade/page")
+ R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 社区随手拍列表统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/easyphoto/statistics")
+ R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询邻里圈话题列表
+ * @param circleTopicAdminDTO 请求参数
+ * @return 邻里圈话题列表
+ */
+ @PostMapping("/neighbor/pageNeighborTopicByAdmin")
+ R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
+
+ /**
+ * 添加邻里圈话题
+ * @param addCircleTopicAdminDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/neighbor/addNeighborTopicByAdmin")
+ R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 编辑邻里圈话题
+ * @param addCircleTopicAdminDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/neighbor/editNeighborTopicByAdmin")
+ R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 小程序查询邻里圈话题列表
+ * @param communityId 社区id
+ * @return 邻里圈话题列表
+ */
+ @GetMapping("/neighbor/getNeighborTopicByApp")
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-查询社区列表
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ R getCommunityLists();
}
--
Gitblit v1.7.1