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/ComActIntegralUserTradeMapper.java

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

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;
@@ -10,8 +13,6 @@
import com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserTradeAdminVO;
import com.panzhihua.common.model.vos.community.integral.admin.IntegralUserVO;
import com.panzhihua.service_community.model.dos.ComActIntegralUserTradeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @auther lyq
@@ -23,24 +24,32 @@

    /**
     * 查询用户某个时间段交易数量
     * @param integralCountDTO  请求参数
     * @return  交易数量
     * 
     * @param integralCountDTO
     *            请求参数
     * @return 交易数量
     */
    Integer getIntegralCount(@Param("integralCountDTO") ComActIntegralCountDTO integralCountDTO);

    /**
     * 小程序-查询用户社区积分明细
     * @param communityTradeDTO 请求参数
     * @return  用户社区积分明细
     * 
     * @param communityTradeDTO
     *            请求参数
     * @return 用户社区积分明细
     */
    IPage<ComActIntegralCommunityTradeVO> getIntegralCommunityTradeApplets(Page page,@Param("communityTradeDTO") ComActIntegralCommunityRankDTO communityTradeDTO);
    IPage<ComActIntegralCommunityTradeVO> getIntegralCommunityTradeApplets(Page page,
        @Param("communityTradeDTO") ComActIntegralCommunityRankDTO communityTradeDTO);

    /**
     * 社区后台-分页查询社区下积分明细记录
     * @param integralRuleDTO   请求参数
     * @return  社区下积分明细记录
     * 
     * @param integralRuleDTO
     *            请求参数
     * @return 社区下积分明细记录
     */
    IPage<ComActIntegralUserTradeAdminVO> getIntegralTradeListAdmin(Page page,@Param("integralRuleDTO") PageComActIntegralTradeDTO integralRuleDTO);
    IPage<ComActIntegralUserTradeAdminVO> getIntegralTradeListAdmin(Page page,
        @Param("integralRuleDTO") PageComActIntegralTradeDTO integralRuleDTO);

    IntegralUserVO getUserInfo(@Param("userId") Long userId);
}