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

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -117,7 +117,7 @@
     * @return 详情
     */
    @PostMapping("detailactivity")
    R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId);

    /**
     * 分页活动报名名单
@@ -1442,7 +1442,7 @@
     * @return
     */
    @PostMapping("/common/data/car/export")
    R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
    R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);

    /**
     * 社区后台实有单位管理列表
@@ -3702,4 +3702,37 @@
     */
    @PostMapping("/dyn/type/delete")
    R deleteDynTypeByAdmin(@RequestBody List<Long> ids);

    /**
     * 随手拍发放奖励
     * @param grantRewardDTO    请求参数
     * @return  发放结果
     */
    @PostMapping("/easyphoto/grantReward")
    R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);

    /**
     * 获取最新活动和用户最新收益
     * @param userId    用户id
     * @param communityId   社区id
     * @return  最新活动和用户最新收益
     */
    @PostMapping("/easyphoto/getUserReward")
    R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);

    /**
     * 读取用户随手拍奖励
     * @param userId    用户id
     * @return  读取结果
     */
    @PostMapping("/easyphoto/readUserReward")
    R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/patrolRecord/page")
    R pagePatrolRecord(@RequestBody ComSwPatrolRecordDTO comSwPatrolRecordDTO);
}