Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java

@@ -29,4 +29,20 @@
    List<ComActActRegistExcelVO> getRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);

    List<ComActActRegistExcelVO> getNoRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    List<ComActActRegistVO> listRegistRecord(@Param("id") Long id, @Param("userId") Long userId);

    /**
     * 获取总积分奖励
     * @param activityId
     * @param userId
     * @return
     */
    Integer selectTotalAwardWithRegist(@Param("activityId") Long activityId, @Param("userId") Long userId);
}