推广部分最后修改

This commit is contained in:
liuyingfang
2023-07-27 09:53:50 +08:00
parent 817223d79f
commit 9e5aca8d74
10 changed files with 260 additions and 59 deletions

View File

@@ -5,6 +5,7 @@ import cn.pluss.platform.dto.MerchantFeeDTO;
import cn.pluss.platform.entity.MerchantChannelStatus;
import cn.pluss.platform.entity.MerchantProfit;
import cn.pluss.platform.vo.DeviceGoodsVO;
import cn.pluss.platform.vo.MerChannelStatusVO;
import cn.pluss.platform.vo.MerchantProfitVO;
import cn.pluss.platform.vo.ProfitOrderVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -32,6 +33,7 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
List<MerchantProfit> queryMerchantProfitPage(Map map);
Integer queryMerchantProfitPageCount(Map map);
Integer queryMerchantProfitPageCountV2(@Param("userId") String userId);
void saveMerchantProfitBatch(List<MerchantProfit> merchantProfitList);
@@ -118,7 +120,12 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
BigDecimal getConsumeFeeTeamToday(@Param("userId") String userId);
List<MerchantProfitVO> getTeamList(@Param("typeCode") String typeCode, @Param("userId") Long userId,
@Param("userName") String userName);
@Param("userName") String userName, @Param("pageSize") Integer pageSize,
@Param("offset") Integer offset);
List<MerchantProfitVO> getMerchantTeamList(@Param("typeCode") String typeCode, @Param("userId") Long userId,
@Param("userName") String userName, @Param("pageSize") Integer pageSize,
@Param("offset") Integer offset);
@Select("SELECT\n" +
"\tcount(*) \n" +
@@ -128,8 +135,9 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
"\tparent_user_id = #{userId}\n" +
"\tAND type_code = #{typeCode}")
Integer getCountChild( @Param("userId") Long userId,@Param("typeCode") String typeCod);
Integer getCountChildV2( @Param("userId") Long userId);
List<MerchantChannelStatus> getChannelStatus(@Param("merchantCode") String merchantCode);
List<MerChannelStatusVO> getChannelStatus(@Param("merchantCode") String merchantCode);
/**
* 直属交易
@@ -138,10 +146,12 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
* @param offset
* @return
*/
List<ProfitOrderVO> directlyOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset);
List<ProfitOrderVO> directlyOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset,
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
* 团队交易
*/
List<ProfitOrderVO> teamOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset);
List<ProfitOrderVO> teamOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset,
@Param("startTime") String startTime, @Param("endTime") String endTime);
}