修改积分默认规则,以及屏蔽微心愿,社区活动,志愿者活动,党员活动积分规则
5个文件已修改
215 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralRuleMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralRuleService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralRuleDOMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralRuleMapper.java
@@ -34,4 +34,10 @@
     */
    IPage<ComActIntegralUserRuleAdminVO> getIntegralRuleAdminList(Page page, @Param("integralRuleDTO") PageComActIntegralRuleDTO integralRuleDTO);
    /**
     * 查询默认启动的积分规则列表
     * @return  默认积分规则列表
     */
    List<ComActIntegralRuleDO> getIntegralDefaultList();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralRuleService.java
@@ -37,4 +37,11 @@
     */
    R editIntegralRuleAdmin(EditComActIntegralRuleDTO integralRuleDTO);
    /**
     * 根据社区id查询社区默认积分规则列表
     * @param communityId   社区id
     * @return  社区默认积分规则列表
     */
    List<ComActIntegralRuleDO> getIntegralRuleList(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java
@@ -57,8 +57,26 @@
     * @param communityId   社区id
     * @return  默认积分规则列表
     */
    private List<ComActIntegralRuleDO> getIntegralRuleList(Long communityId){
    @Override
    public List<ComActIntegralRuleDO> getIntegralRuleList(Long communityId){
        List<ComActIntegralRuleDO> integralRuleList = new ArrayList<>();
        List<ComActIntegralRuleDO> defaultRuleList = this.baseMapper.getIntegralDefaultList();
        if(!defaultRuleList.isEmpty()){
            defaultRuleList.forEach(defaultRule -> {
                ComActIntegralRuleDO integralRuleDO = new ComActIntegralRuleDO();
                integralRuleDO.setCommunityId(communityId);
                integralRuleDO.setName(defaultRule.getName());
                integralRuleDO.setAmount(defaultRule.getAmount());
                integralRuleDO.setIntegralDescribe(defaultRule.getIntegralDescribe());
                integralRuleDO.setIsRestrict(defaultRule.getIsRestrict());
                integralRuleDO.setType(defaultRule.getType());
                integralRuleDO.setCount(defaultRule.getCount());
                integralRuleDO.setIntegralType(defaultRule.getIntegralType());
                integralRuleList.add(integralRuleDO);
            });
            return integralRuleList;
        }
        //随手拍默认积分规则
        ComActIntegralRuleDO integralRuleSSPDO = new ComActIntegralRuleDO();
@@ -73,16 +91,16 @@
        integralRuleList.add(integralRuleSSPDO);
        //微心愿默认积分规则
        ComActIntegralRuleDO integralRuleWXYDO = new ComActIntegralRuleDO();
        integralRuleWXYDO.setCommunityId(communityId);
        integralRuleWXYDO.setName("发布微心愿");
        integralRuleWXYDO.setAmount(7);
        integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
        integralRuleWXYDO.setIsRestrict(1);
        integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleWXYDO.setCount(0);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
        integralRuleList.add(integralRuleWXYDO);
//        ComActIntegralRuleDO integralRuleWXYDO = new ComActIntegralRuleDO();
//        integralRuleWXYDO.setCommunityId(communityId);
//        integralRuleWXYDO.setName("发布微心愿");
//        integralRuleWXYDO.setAmount(7);
//        integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
//        integralRuleWXYDO.setIsRestrict(1);
//        integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
//        integralRuleWXYDO.setCount(0);
//        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
//        integralRuleList.add(integralRuleWXYDO);
        //议事投票默认积分规则
        ComActIntegralRuleDO integralRuleYSTPDO = new ComActIntegralRuleDO();
@@ -97,42 +115,42 @@
        integralRuleList.add(integralRuleYSTPDO);
        //志愿者活动默认积分规则
        ComActIntegralRuleDO integralRuleZYZDO = new ComActIntegralRuleDO();
        integralRuleZYZDO.setCommunityId(communityId);
        integralRuleZYZDO.setName("参与志愿者活动");
        integralRuleZYZDO.setAmount(2);
        integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动,仅限志愿者");
        integralRuleZYZDO.setIsRestrict(1);
        integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleZYZDO.setCount(0);
        integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
        integralRuleList.add(integralRuleZYZDO);
//        ComActIntegralRuleDO integralRuleZYZDO = new ComActIntegralRuleDO();
//        integralRuleZYZDO.setCommunityId(communityId);
//        integralRuleZYZDO.setName("参与志愿者活动");
//        integralRuleZYZDO.setAmount(2);
//        integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动,仅限志愿者");
//        integralRuleZYZDO.setIsRestrict(1);
//        integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
//        integralRuleZYZDO.setCount(0);
//        integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
//        integralRuleList.add(integralRuleZYZDO);
        //社区活动默认积分规则
        ComActIntegralRuleDO integralRuleSQHDDO = new ComActIntegralRuleDO();
        integralRuleSQHDDO.setCommunityId(communityId);
        integralRuleSQHDDO.setName("参与社区活动");
        integralRuleSQHDDO.setAmount(2);
        integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动,所有人可参与");
        integralRuleSQHDDO.setIsRestrict(1);
        integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleSQHDDO.setCount(0);
        integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
        integralRuleList.add(integralRuleSQHDDO);
//        ComActIntegralRuleDO integralRuleSQHDDO = new ComActIntegralRuleDO();
//        integralRuleSQHDDO.setCommunityId(communityId);
//        integralRuleSQHDDO.setName("参与社区活动");
//        integralRuleSQHDDO.setAmount(2);
//        integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动,所有人可参与");
//        integralRuleSQHDDO.setIsRestrict(1);
//        integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
//        integralRuleSQHDDO.setCount(0);
//        integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
//        integralRuleList.add(integralRuleSQHDDO);
        //党员活动默认积分规则
        ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
        integralRuleDYHDDO.setCommunityId(communityId);
        integralRuleDYHDDO.setName("参与党员活动");
        integralRuleDYHDDO.setAmount(1);
        integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动,党员可参与");
        integralRuleDYHDDO.setIsRestrict(1);
        integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
        integralRuleDYHDDO.setCount(0);
        integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
        integralRuleList.add(integralRuleDYHDDO);
//        ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
//        integralRuleDYHDDO.setCommunityId(communityId);
//        integralRuleDYHDDO.setName("参与党员活动");
//        integralRuleDYHDDO.setAmount(1);
//        integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动,党员可参与");
//        integralRuleDYHDDO.setIsRestrict(1);
//        integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
//        integralRuleDYHDDO.setCount(0);
//        integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
//        integralRuleList.add(integralRuleDYHDDO);
        //党员活动默认积分规则
        //问卷调查默认积分规则
        ComActIntegralRuleDO integralRuleWJDCDO = new ComActIntegralRuleDO();
        integralRuleWJDCDO.setCommunityId(communityId);
        integralRuleWJDCDO.setName("参与问卷调查");
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
@@ -86,7 +86,7 @@
        List<ComActIntegralUserRuleVO> integralUserRuleList = comActIntegralRuleService.getIntegralReceiveApplets(communityId);
        if(integralUserRuleList.isEmpty()){
            //如果没有查询到列表数据,增给社区增加默认规则列表再查询
            List<ComActIntegralRuleDO> integralRuleList = getIntegralRuleList(communityId);
            List<ComActIntegralRuleDO> integralRuleList = comActIntegralRuleService.getIntegralRuleList(communityId);
            comActIntegralRuleService.saveBatch(integralRuleList);
            integralUserRuleList = comActIntegralRuleService.getIntegralReceiveApplets(communityId);
        }
@@ -160,100 +160,6 @@
        integralUserVO.setAmount(amount);
        integralUserVO.setIntegralUserList(integralUserList);
        return R.ok(integralUserVO);
    }
    /**
     * 加载默认社区积分规则列表
     * @param communityId   社区id
     * @return  默认积分规则列表
     */
    private List<ComActIntegralRuleDO> getIntegralRuleList(Long communityId){
        List<ComActIntegralRuleDO> integralRuleList = new ArrayList<>();
        //随手拍默认积分规则
        ComActIntegralRuleDO integralRuleSSPDO = new ComActIntegralRuleDO();
        integralRuleSSPDO.setCommunityId(communityId);
        integralRuleSSPDO.setName("发布随手拍");
        integralRuleSSPDO.setAmount(0);
        integralRuleSSPDO.setIntegralDescribe("发布随手拍并被公示后");
        integralRuleSSPDO.setIsRestrict(1);
        integralRuleSSPDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleSSPDO.setCount(0);
        integralRuleSSPDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
        integralRuleList.add(integralRuleSSPDO);
        //微心愿默认积分规则
        ComActIntegralRuleDO integralRuleWXYDO = new ComActIntegralRuleDO();
        integralRuleWXYDO.setCommunityId(communityId);
        integralRuleWXYDO.setName("发布微心愿");
        integralRuleWXYDO.setAmount(0);
        integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
        integralRuleWXYDO.setIsRestrict(1);
        integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleWXYDO.setCount(0);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
        integralRuleList.add(integralRuleWXYDO);
        //议事投票默认积分规则
        ComActIntegralRuleDO integralRuleYSTPDO = new ComActIntegralRuleDO();
        integralRuleYSTPDO.setCommunityId(communityId);
        integralRuleYSTPDO.setName("参与议事投票");
        integralRuleYSTPDO.setAmount(0);
        integralRuleYSTPDO.setIntegralDescribe("参与议事投票");
        integralRuleYSTPDO.setIsRestrict(1);
        integralRuleYSTPDO.setType(ComActIntegralRuleDO.type.day);
        integralRuleYSTPDO.setCount(0);
        integralRuleYSTPDO.setIntegralType(ComActIntegralRuleDO.integralType.cyystp);
        integralRuleList.add(integralRuleYSTPDO);
        //志愿者活动默认积分规则
        ComActIntegralRuleDO integralRuleZYZDO = new ComActIntegralRuleDO();
        integralRuleZYZDO.setCommunityId(communityId);
        integralRuleZYZDO.setName("参与志愿者活动");
        integralRuleZYZDO.setAmount(0);
        integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动,仅限志愿者");
        integralRuleZYZDO.setIsRestrict(1);
        integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleZYZDO.setCount(0);
        integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
        integralRuleList.add(integralRuleZYZDO);
        //社区活动默认积分规则
        ComActIntegralRuleDO integralRuleSQHDDO = new ComActIntegralRuleDO();
        integralRuleSQHDDO.setCommunityId(communityId);
        integralRuleSQHDDO.setName("参与社区活动");
        integralRuleSQHDDO.setAmount(0);
        integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动,所有人可参与");
        integralRuleSQHDDO.setIsRestrict(1);
        integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleSQHDDO.setCount(0);
        integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
        integralRuleList.add(integralRuleSQHDDO);
        //党员活动默认积分规则
        ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
        integralRuleDYHDDO.setCommunityId(communityId);
        integralRuleDYHDDO.setName("参与党员活动");
        integralRuleDYHDDO.setAmount(0);
        integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动,党员可参与");
        integralRuleDYHDDO.setIsRestrict(1);
        integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
        integralRuleDYHDDO.setCount(0);
        integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
        integralRuleList.add(integralRuleDYHDDO);
        //党员活动默认积分规则
        ComActIntegralRuleDO integralRuleWJDCDO = new ComActIntegralRuleDO();
        integralRuleWJDCDO.setCommunityId(communityId);
        integralRuleWJDCDO.setName("参与问卷调查");
        integralRuleWJDCDO.setAmount(0);
        integralRuleWJDCDO.setIntegralDescribe("参与问卷调查");
        integralRuleWJDCDO.setIsRestrict(1);
        integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day);
        integralRuleWJDCDO.setCount(0);
        integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cydcwj);
        integralRuleList.add(integralRuleWJDCDO);
        return integralRuleList;
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralRuleDOMapper.xml
@@ -30,4 +30,8 @@
    <select id="getIntegralRuleAdminList" resultType="com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserRuleAdminVO">
        select id,`name`,amount,integral_describe,is_restrict,type,count,integral_type,remark,create_at,update_at from com_act_integral_rule where community_id = #{integralRuleDTO.communityId}
    </select>
    <select id="getIntegralDefaultList" resultType="com.panzhihua.service_community.model.dos.ComActIntegralRuleDO">
        select * from com_act_integral_rule_default where `status` = 1
    </select>
</mapper>