Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,5 +1,10 @@
package com.panzhihua.service_community.dao;

import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,10 +12,6 @@
import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserRuleVO;
import com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserRuleAdminVO;
import com.panzhihua.service_community.model.dos.ComActIntegralRuleDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
@@ -22,21 +23,27 @@

    /**
     * 查询社区下积分任务列表
     * @param communityId   社区id
     * @return  查询社区下积分任务列表
     * 
     * @param communityId
     *            社区id
     * @return 查询社区下积分任务列表
     */
    List<ComActIntegralUserRuleVO> getIntegralReceiveApplets(@Param("communityId") Long communityId);

    /**
     * 社区后台-根据社区id查询社区下积分规则列表
     * @param integralRuleDTO   请求参数
     * @return  社区下积分规则列表
     * 
     * @param integralRuleDTO
     *            请求参数
     * @return 社区下积分规则列表
     */
    IPage<ComActIntegralUserRuleAdminVO> getIntegralRuleAdminList(Page page, @Param("integralRuleDTO") PageComActIntegralRuleDTO integralRuleDTO);
    IPage<ComActIntegralUserRuleAdminVO> getIntegralRuleAdminList(Page page,
        @Param("integralRuleDTO") PageComActIntegralRuleDTO integralRuleDTO);

    /**
     * 查询默认启动的积分规则列表
     * @return  默认积分规则列表
     * 
     * @return 默认积分规则列表
     */
    List<ComActIntegralRuleDO> getIntegralDefaultList();