From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 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 ce6aa27..71b14a4 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
@@ -1795,6 +1795,16 @@
R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
+ * 批量导入低保户
+ *
+ * @param list 低保户数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importLowSecurity")
+ R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
* 确认导入实有人口（有则更新，无则新建）
*
* @param list 用户信息
@@ -1959,6 +1969,23 @@
*/
@GetMapping("/questnaire/view/detail")
R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-新增问卷调查浏览数量
+ * @param questId 问卷调查id
+ * @return 增加结果
+ */
+ @GetMapping("/questnaire/add/view")
+ R addView(@RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-用户弹窗添加不在提醒接口
+ * @param questId 问卷id
+ * @param userId 用户id
+ * @return 添加结果
+ */
+ @GetMapping("/questnaire/add/noNotice")
+ R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
/**
* 社区后台-查询问卷调查详情
@@ -3765,6 +3792,38 @@
R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
/**
+ * 查询用户交易记录总额
+ * @param pageTradeAdminDTO 请求参数
+ * @return 交易记录总额
+ */
+ @PostMapping("/user/wallet/trade/total")
+ R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询用户导出数据
+ * @param pageTradeAdminDTO 请求参数
+ * @return 用户导出数据
+ */
+ @PostMapping("/user/wallet/trade/export")
+ R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 导出奖励台账数据
+ * @param pageTradeAdminDTO 请求参数
+ * @return 奖励台账数据
+ */
+ @PostMapping("/user/wallet/trade/reward/export")
+ R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询社区统计数据
+ * @param pageTradeAdminDTO 查询社区统计数据
+ * @return 社区统计数据
+ */
+ @PostMapping("/user/wallet/trade/statistics")
+ R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
* 社区随手拍列表统计
* @param communityId 社区id
* @return 统计结果
--
Gitblit v1.7.1