From a84abede0a76ee2eadd21ba82fe69606db669448 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 15:47:26 +0800
Subject: [PATCH] Merge branch 'txb'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   86 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 86 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 b127eb9..6b5d408 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
@@ -19,6 +19,7 @@
 import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
 import com.panzhihua.common.model.dtos.community.wallet.*;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
@@ -1771,6 +1772,36 @@
      */
     @PostMapping("/common/data/population/importSentence")
     R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入退役军人
+     *
+     * @param list        退役军人数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importVeterans")
+    R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入残疾人
+     *
+     * @param list        残疾人数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importDisability")
+    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);
 
     /**
      * 确认导入实有人口（有则更新，无则新建）
@@ -3717,6 +3748,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  统计结果
@@ -4110,4 +4173,27 @@
     @PostMapping("timedTaskActivityNotice")
     R timedTaskActivityNotice();
 
+    /**
+     * 查询社区所有列表
+     * @return  社区列表
+     */
+    @GetMapping("/switch/community/all/list")
+    R communitySwitchList();
+
+    /**
+     * 根据名字查询所有社区列表
+     * @param name  社区名字
+     * @return  社区列表
+     */
+    @GetMapping("/switch/community/search/list")
+    R communitySwitchSearchList(@RequestParam(value = "name") String name);
+
+    /**
+     * 根据经纬度以及距离搜索附近社区列表
+     * @param communityDTO  请求参数
+     * @return  社区列表
+     */
+    @PostMapping("/switch/community/search/distance/list")
+    R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);
+
 }

--
Gitblit v1.7.1