feat(mall): 新增等级说明和佣金排行榜功能

Administrator

2025-05-13 c98641903320a6a572970b00141f252d634e76cd

feat(mall): 新增等级说明和佣金排行榜功能

- 新增 ApiLevelListInfoVo 类用于等级说明信息展示
- 新增 ApiSaleRecordInfoDto 和 ApiSaleRecordInfoVo 类用于佣金排行榜参数和结果展示
- 在 ApiSaleController 中添加 levelInfoList 和 saleRecord 接口
- 在 ApiSaleService 中添加 levelInfoList 和 saleRecord 方法
- 在 ApiSaleServiceImpl 中实现 levelInfoList 和 saleRecord 方法的逻辑
- 修改 MallMemberMapper.xml 中的 SQL 查询，使用 mall_achieve_record 替代 mall_order_info

 src/main/java/cc/mrbird/febs/mall/controller/member/ApiSaleController.java

@@ -2,6 +2,7 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.sale.ApiSaleListInfoDto;
import cc.mrbird.febs.mall.dto.sale.ApiSaleRecordInfoDto;
import cc.mrbird.febs.mall.dto.sale.ApiTeamListInfoDto;
import cc.mrbird.febs.mall.service.ApiSaleService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
@@ -74,4 +75,24 @@

        return apiSaleService.saleList(dto);
    }

    @ApiOperation(value = "等级说明", notes = "等级说明")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiLevelListInfoVo.class)
    })
    @PostMapping(value = "/levelInfoList")
    public FebsResponse levelInfoList() {

        return apiSaleService.levelInfoList();
    }

    @ApiOperation(value = "佣金排行榜", notes = "佣金排行榜")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiSaleRecordInfoVo.class)
    })
    @PostMapping(value = "/saleRecord")
    public FebsResponse saleRecord(@RequestBody @Validated ApiSaleRecordInfoDto dto) {

        return apiSaleService.saleRecord(dto);
    }
}

 src/main/java/cc/mrbird/febs/mall/dto/sale/ApiSaleListInfoDto.java

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "开始时间", example = "123")
    private String startTime;

    @ApiModelProperty(value = "用户", example = "123")
    private String memberName;

    @ApiModelProperty(value = "结束时间", example = "123")
    private String endTime;


 src/main/java/cc/mrbird/febs/mall/dto/sale/ApiSaleRecordInfoDto.java

New file
@@ -0,0 +1,16 @@
package cc.mrbird.febs.mall.dto.sale;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel(value = "ApiSaleRecordInfoDto", description = "参数")
public class ApiSaleRecordInfoDto {

    @NotNull(message = "分类不能为空")
    @ApiModelProperty(value = "分类 1-月排行 2-周", example = "1")
    private Integer type;
}

 src/main/java/cc/mrbird/febs/mall/dto/sale/ApiTeamListInfoDto.java

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "开始时间", example = "123")
    private String startTime;

    @ApiModelProperty(value = "用户", example = "123")
    private String memberName;

    @ApiModelProperty(value = "结束时间", example = "123")
    private String endTime;


 src/main/java/cc/mrbird/febs/mall/service/ApiSaleService.java

@@ -2,6 +2,7 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.sale.ApiSaleListInfoDto;
import cc.mrbird.febs.mall.dto.sale.ApiSaleRecordInfoDto;
import cc.mrbird.febs.mall.dto.sale.ApiTeamListInfoDto;
import cc.mrbird.febs.mall.entity.MallMember;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,4 +18,8 @@
    FebsResponse saleHeader();

    FebsResponse saleList(ApiSaleListInfoDto dto);

    FebsResponse levelInfoList();

    FebsResponse saleRecord(ApiSaleRecordInfoDto dto);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java

@@ -1,16 +1,17 @@
package cc.mrbird.febs.mall.service.impl;

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.sale.ApiSaleListInfoDto;
import cc.mrbird.febs.mall.dto.sale.ApiSaleRecordInfoDto;
import cc.mrbird.febs.mall.dto.sale.ApiTeamListInfoDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.ApiSaleService;
import cc.mrbird.febs.mall.vo.sale.*;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,8 +21,7 @@
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

@Slf4j
@@ -30,10 +30,8 @@
public class ApiSaleServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements ApiSaleService {

    private final HappySaleLevelMapper happySaleLevelMapper;
    private final MallMoneyFlowMapper mallMoneyFlowMapper;
    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final MallAchieveRecordMapper mallAchieveRecordMapper;

    private final MallMemberWalletMapper mallMemberWalletMapper;
    @Override
    public FebsResponse saleInfo() {
        ApiSaleInfoVo apiSaleInfoVo = new ApiSaleInfoVo();
@@ -44,6 +42,7 @@
        apiSaleInfoVo.setName(mallMember.getName());
        apiSaleInfoVo.setAvatar(mallMember.getAvatar());
        apiSaleInfoVo.setInviteId(mallMember.getInviteId());
        apiSaleInfoVo.setStoreMaster(mallMember.getStoreMaster());

        HappySaleLevel happySaleLevel = happySaleLevelMapper.selectOne(
                new LambdaQueryWrapper<HappySaleLevel>()
@@ -55,19 +54,20 @@
            apiSaleInfoVo.setStoreMasterPng(happySaleLevel.getIconPng());
        }

        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectList(
                new LambdaQueryWrapper<MallAchieveRecord>()
                        .eq(MallAchieveRecord::getMemberId, id)
        );
        if (CollUtil.isNotEmpty(mallAchieveRecords)) {
            apiSaleInfoVo.setTotalSaleAmount(
                    CollUtil.isNotEmpty(mallAchieveRecords)
                            ? mallAchieveRecords.stream().map(MallAchieveRecord::getCostAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                            : BigDecimal.ZERO);
            apiSaleInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallAchieveRecords) ? mallAchieveRecords.size() : 0);
        }

        List<MallMember> mallMembers = this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId());
        apiSaleInfoVo.setTotalCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);

        List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
                new LambdaQueryWrapper<MallMoneyFlow>()
                        .eq(MallMoneyFlow::getMemberId, id)
                        .eq(MallMoneyFlow::getType, ScoreFlowTypeEnum.SALE_RECOMMEND.getValue())
        );
        apiSaleInfoVo.setTotalSaleAmount(
                CollUtil.isNotEmpty(mallMoneyFlows)
                        ? mallMoneyFlows.stream().map(MallMoneyFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                        : BigDecimal.ZERO);
        apiSaleInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallMoneyFlows) ? mallMoneyFlows.size() : 0);

        // todo 提现部分暂无

@@ -87,21 +87,14 @@
            apiTeamHeaderInfoVo.setTotalAmount(BigDecimal.ZERO);
        }else{
            apiTeamHeaderInfoVo.setTotalCnt(mallMembers.size());
            //stream流获取mallMembers的全部id的set集合
            Set<Long> memberIds = mallMembers.stream().map(MallMember::getId).collect(Collectors.toSet());
            List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectList(
                    new LambdaQueryWrapper<MallOrderInfo>()
                            .select(MallOrderInfo::getAmount)
                            .in(MallOrderInfo::getMemberId, memberIds)
                            .eq(MallOrderInfo::getStatus, OrderStatusEnum.FINISH.getValue())
            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectList(
                    new LambdaQueryWrapper<MallAchieveRecord>()
                            .eq(MallAchieveRecord::getMemberId, id)
            );
            if(CollUtil.isEmpty(mallOrderInfos)){
                apiTeamHeaderInfoVo.setTotalAmount(BigDecimal.ZERO);
            }else{
                apiTeamHeaderInfoVo.setTotalAmount(
                        mallOrderInfos.stream().map(MallOrderInfo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                );
            }
                    CollUtil.isNotEmpty(mallAchieveRecords)
                            ? mallAchieveRecords.stream().map(MallAchieveRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                            : BigDecimal.ZERO);
        }
        return new FebsResponse().success().data(apiTeamHeaderInfoVo);
    }
@@ -123,16 +116,15 @@
        ApiSaleHeaderInfoVo apiSaleHeaderInfoVo = new ApiSaleHeaderInfoVo();

        Long id = LoginUserUtil.getLoginUser().getId();
        List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
                new LambdaQueryWrapper<MallMoneyFlow>()
                        .eq(MallMoneyFlow::getMemberId, id)
                        .eq(MallMoneyFlow::getType, ScoreFlowTypeEnum.SALE_RECOMMEND.getValue())
        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectList(
                new LambdaQueryWrapper<MallAchieveRecord>()
                        .eq(MallAchieveRecord::getMemberId, id)
        );
        apiSaleHeaderInfoVo.setTotalSaleAmount(
                CollUtil.isNotEmpty(mallMoneyFlows)
                        ? mallMoneyFlows.stream().map(MallMoneyFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                CollUtil.isNotEmpty(mallAchieveRecords)
                        ? mallAchieveRecords.stream().map(MallAchieveRecord::getCostAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                        : BigDecimal.ZERO);
        apiSaleHeaderInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallMoneyFlows) ? mallMoneyFlows.size() : 0);
        apiSaleHeaderInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallAchieveRecords) ? mallAchieveRecords.size() : 0);
        return new FebsResponse().success().data(apiSaleHeaderInfoVo);
    }

@@ -145,4 +137,131 @@
        Page<ApiSaleListInfoVo> mallAchieveRecordPage = this.baseMapper.selectSalePage(objectPage, dto);
        return new FebsResponse().success().data(mallAchieveRecordPage);
    }

    @Override
    public FebsResponse levelInfoList() {
        ArrayList<ApiLevelListInfoVo> apiLevelListInfoVos = new ArrayList<>();

        List<HappySaleLevel> happySaleLevels = happySaleLevelMapper.selectList(
                new LambdaQueryWrapper<HappySaleLevel>()
                        .orderByAsc(HappySaleLevel::getCode)
        );
        if (CollUtil.isNotEmpty(happySaleLevels)) {
            happySaleLevels.forEach(happySaleLevel -> {
                ApiLevelListInfoVo apiLevelListInfoVo = new ApiLevelListInfoVo();
                apiLevelListInfoVo.setName(happySaleLevel.getName());
                apiLevelListInfoVo.setCode(happySaleLevel.getCode());
                apiLevelListInfoVo.setContent(happySaleLevel.getContent());
                apiLevelListInfoVo.setIconPng(happySaleLevel.getIconPng());
                apiLevelListInfoVos.add(apiLevelListInfoVo);
            });
        }
        return new FebsResponse().success().data(apiLevelListInfoVos);
    }

    /**
     * 处理销售记录信息
     *
     * 根据提供的类型参数，查询并统计指定时间范围内的销售记录，并返回相关会员的销售总额信息
     * 类型参数为1时，查询本月的销售记录；类型参数为2时，查询本周的销售记录
     *
     * @param dto 包含类型信息的ApiSaleRecordInfoDto对象，用于指定查询类型
     * @return 返回包含销售记录信息的FebsResponse对象，包括会员名称、头像和消费金额
     */
    @Override
    public FebsResponse saleRecord(ApiSaleRecordInfoDto dto) {
        // 初始化结果列表
        ApiSaleRecordInfoVo apiSaleRecordInfoVo = new ApiSaleRecordInfoVo();
        List<ApiSaleRecordInfoVo> apiSaleRecordInfoVos = new ArrayList<>();

        // 获取当前登录用户的ID
        Long memberId = LoginUserUtil.getLoginUser().getId();
        // 根据ID查询会员信息
        MallMember mallMember = this.baseMapper.selectById(memberId);
        // 设置会员名称、头像、排序号和消费金额初始值
        apiSaleRecordInfoVo.setName(mallMember.getName());
        apiSaleRecordInfoVo.setAvatar(mallMember.getAvatar());
        apiSaleRecordInfoVo.setSortCnt(0);
        apiSaleRecordInfoVo.setCostAmount(BigDecimal.ZERO);

        // 获取类型参数
        Integer type = dto.getType();
        // 校验类型参数，确保其为1（月）或2（周）
        if (type == null || (type != 1 && type != 2)) {
            return new FebsResponse().fail().message("非法的类型参数");
        }

        // 根据类型参数确定开始时间
        DateTime startTime = type == 1 ? DateUtil.beginOfMonth(new Date()) : DateUtil.beginOfWeek(new Date());

        // 查询指定时间范围内的商城销售记录
        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectList(
                new LambdaQueryWrapper<MallAchieveRecord>()
                        .select(MallAchieveRecord::getMemberId, MallAchieveRecord::getCostAmount)
                        .ge(MallAchieveRecord::getCreatedTime, startTime)
        );

        // 如果查询到销售记录，则进行处理
        if (CollUtil.isNotEmpty(mallAchieveRecords)) {
            // 提取 memberId 集合，避免重复 stream
            Set<Long> memberIds = mallAchieveRecords.stream()
                    .map(MallAchieveRecord::getMemberId)
                    .collect(Collectors.toSet());

            // 分组求和
            Map<Long, BigDecimal> memberIdToCostAmount = mallAchieveRecords.stream()
                    .collect(Collectors.groupingBy(
                            MallAchieveRecord::getMemberId,
                            Collectors.mapping(
                                    MallAchieveRecord::getCostAmount,
                                    Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)
                            )
                    ));

            // 查询会员信息
            List<MallMember> mallMembers = this.baseMapper.selectList(
                    new LambdaQueryWrapper<MallMember>()
                            .select(MallMember::getId, MallMember::getName, MallMember::getAvatar)
                            .in(MallMember::getId, memberIds)
            );

            // 构建会员信息映射表
            Map<Long, MallMember> mallMemberMap = mallMembers.stream()
                    .collect(Collectors.toMap(MallMember::getId, m -> m));

            // 构建结果列表并避免空指针
            for (Map.Entry<Long, BigDecimal> entry : memberIdToCostAmount.entrySet()) {
                MallMember member = mallMemberMap.get(entry.getKey());
                if (member == null) {
                    continue; // 忽略不存在的会员
                }
                ApiSaleRecordInfoVo vo = new ApiSaleRecordInfoVo();
                vo.setId(member.getId());
                vo.setName(member.getName());
                vo.setAvatar(member.getAvatar());
                vo.setCostAmount(entry.getValue());
                apiSaleRecordInfoVos.add(vo);
            }

            // 排序
            apiSaleRecordInfoVos.sort(Comparator.comparing(ApiSaleRecordInfoVo::getCostAmount).reversed());

            //stream流操作apiSaleRecordInfoVos获取id等于memberId的数据，并且返回第一个数据和在数组中的下标索引
            ApiSaleRecordInfoVo memberSale = apiSaleRecordInfoVos.stream()
                    .filter(vo -> vo.getId().equals(memberId))
                    .findFirst()
                    .orElse(null);
            if (memberSale != null) {
                apiSaleRecordInfoVo.setSortCnt(apiSaleRecordInfoVos.indexOf(memberSale)+1);
                apiSaleRecordInfoVo.setCostAmount(memberSale.getCostAmount());
            }
        }
        apiSaleRecordInfoVo.setSaleRecord(apiSaleRecordInfoVos);

        // 返回成功响应，包含销售记录信息
        return new FebsResponse().success().data(apiSaleRecordInfoVo);
    }



}

 src/main/java/cc/mrbird/febs/mall/vo/sale/ApiLevelListInfoVo.java

New file
@@ -0,0 +1,21 @@
package cc.mrbird.febs.mall.vo.sale;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "ApiLevelListInfoVo", description = "我的推广")
public class ApiLevelListInfoVo {

    @ApiModelProperty(value = "等级名称")
    private String name;
    @ApiModelProperty(value = "分销等级（当前等级等于我的推广接口中的分销等级）")
    private Integer code;
    @ApiModelProperty(value = "规则说明")
    private String content;
    @ApiModelProperty(value = "等级图片")
    private String iconPng;


}

 src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleInfoVo.java

@@ -23,6 +23,9 @@
    private String inviteId;

    @ApiModelProperty(value = "分销等级")
    private Integer storeMaster;

    @ApiModelProperty(value = "分销等级名称")
    private String storeMasterName;

    @ApiModelProperty(value = "分销等级图片")
@@ -32,13 +35,10 @@
    private BigDecimal totalSaleAmount;

    @ApiModelProperty(value = "总推广人（我的团队）")
    private int totalCnt;
    private Integer totalCnt;

    @ApiModelProperty(value = "分销订单")
    private int orderCnt;

    @ApiModelProperty(value = "佣金排行")
    private int sortCnt;
    private Integer orderCnt;

    @ApiModelProperty(value = "可提现")
    private BigDecimal avaAmount;

 src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleListInfoVo.java

@@ -12,8 +12,8 @@
@ApiModel(value = "ApiTeamListInfoVo", description = "")
public class ApiSaleListInfoVo {

    @ApiModelProperty(value = "订单编号")
    private String orderNo;
    @ApiModelProperty(value = "用户")
    private String memberName;

    @ApiModelProperty(value = "返佣时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

 src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleRecordInfoVo.java

New file
@@ -0,0 +1,32 @@
package cc.mrbird.febs.mall.vo.sale;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@ApiModel(value = "ApiSaleRecordInfoVo", description = "")
public class ApiSaleRecordInfoVo {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "昵称")
    private String name;

    @ApiModelProperty(value = "头像")
    private String avatar;

    @ApiModelProperty(value = "名次")
    private Integer sortCnt;

    @ApiModelProperty(value = "返佣金额")
    private BigDecimal costAmount;

    @ApiModelProperty(value = "排行榜")
    private List<ApiSaleRecordInfoVo> saleRecord;

}

 src/main/resources/mapper/modules/MallMemberMapper.xml

@@ -503,24 +503,23 @@
                    SELECT
                    count(c.id)
                    FROM
                    mall_order_info c
                    mall_achieve_record c
                    where a.id = c.member_id
                    AND c.STATUS = 4
                ) orderCnt,
                ifnull(
                    (
                        SELECT
                            sum(b.amount)
                    sum(b.amount, 0)
                        FROM
                            mall_order_info b
                    mall_achieve_record b
                        where a.id = b.member_id
                        AND b.STATUS = 4
                    ),
                0) amount
                ) amount
        FROM mall_member a
        <where>
            and find_in_set(#{record.inviteId}, a.referrer_ids)
            <if test="record != null" >
                <if test="record.memberName != null and record.memberName != ''">
                    and a.name like concat('%',  #{record.memberName},'%')
                </if>
                <if test="record.startTime != null and record.startTime != ''">
                    and a.CREATED_TIME &gt;= #{record.startTime}
                </if>
@@ -536,20 +535,19 @@

    <select id="selectSalePage" resultType="cc.mrbird.febs.mall.vo.sale.ApiSaleListInfoVo">
        SELECT
            (
                SELECT
                c.order_no
                FROM
                mall_order_info c
                where a.order_id = c.id
            ) orderNo,
            c.name memberName,
            a.CREATED_TIME createdTime,
            a.cost_amount costAmount,
            a.amount amount
        FROM mall_achieve_record a
        left join mall_order_info b on a.order_id = b.id
        left join mall_member c on b.member_id = c.id
        <where>
            and a.member_id = #{record.memberId}
            <if test="record != null" >
                <if test="record.memberName != null and record.memberName != ''">
                    and c.name like concat('%',  #{record.memberName},'%')
                </if>
                <if test="record.startTime != null and record.startTime != ''">
                    and a.CREATED_TIME &gt;= #{record.startTime}
                </if>