From c7450a8e1724528046af3683d49eaf0a06785130 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 30 七月 2021 14:02:02 +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 | 77 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 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 e4986ac..528017c 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,11 @@ 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.integral.ComActIntegralCommunityRankDTO; +import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO; +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.wallet.*; import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO; @@ -3840,4 +3845,76 @@ */ @PostMapping("/patrolRecord/statistics") R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId); + + /** + * 小程序-查询积分说明 + * @return 积分说明 + */ + @GetMapping("/integral/explain/applets") + R getIntegralExplainApplets(); + + /** + * 小程序-用户查询当前社区可领取积分规则列表 + * @param userId 用户id + * @param communityId 社区id + * @return 可领取积分规则列表 + */ + @PostMapping("/integral/receive/applets") + 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); + + /** + * 小程序-查询社区积分账户排行榜 + * @param communityRankDTO 请求参数 + * @return 社区积分账户排行榜 + */ + @PostMapping("/integral/community/rank/applets") + R getIntegralCommunityRankApplets(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO); + + /** + * 小程序-查询用户社区积分明细 + * @param communityTradeDTO 请求参数 + * @return 用户社区积分明细 + */ + @PostMapping("/integral/community/trade/applets") + R getIntegralCommunityTradeApplets(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO); + + /** + * 社区后台-根据社区id查询社区下积分规则列表 + * @param integralRuleDTO 请求参数 + * @return 社区下积分规则列表 + */ + @PostMapping("/integral/rule/list/admin") + R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO); + + /** + * 社区后台-编辑社区积分规则 + * @param integralRuleDTO 请求参数 + * @return 编辑结果 + */ + @PostMapping("/integral/rule/edit/admin") + R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO); + + /** + * 社区后台-分页查询社区下积分明细记录 + * @param integralRuleDTO 请求参数 + * @return 社区下积分明细记录 + */ + @PostMapping("/integral/user/trade/page/admin") + R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO); + + /** + * 给用户添加积分 + * @param integralUserDTO 请求参数 + * @return 添加积分结果 + */ + @PostMapping("/integral/user/add/admin") + R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO); } -- Gitblit v1.7.1