Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

 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;
@@ -3643,9 +3648,8 @@

    /**
     * 社区随手拍列表统计
     *
     * @param communityId 社区id
     * @return 统计结果
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("/easyphoto/statistics")
    R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
@@ -3893,6 +3897,86 @@
    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);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * @param activityId    活动id
     * @return  社区活动报名人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);

    /**
     * 分页查询值班表
     *
     * @param comSwRotaPageDTO 查询参数