fix(mall): 修正团队累计消费金额的计算逻辑

Administrator

2025-05-21 5fea0979a485fde02e3a76d6d3786f4182c9c9e2

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

@@ -1,16 +1,23 @@
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.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
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.memberLevel.ApiMemberLevelListInfoVo;
import cc.mrbird.febs.mall.vo.sale.*;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
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 +27,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 +36,11 @@
public class ApiSaleServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements ApiSaleService {

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

    private final MallMemberWalletMapper mallMemberWalletMapper;
    private final MallMemberMapper mallMemberMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    @Override
    public FebsResponse saleInfo() {
        ApiSaleInfoVo apiSaleInfoVo = new ApiSaleInfoVo();
@@ -44,6 +51,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,21 +63,21 @@
            apiSaleInfoVo.setStoreMasterPng(happySaleLevel.getIconPng());
        }

        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())
        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectList(
                new LambdaQueryWrapper<MallAchieveRecord>()
                        .eq(MallAchieveRecord::getMemberId, id)
        );
        apiSaleInfoVo.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);
        apiSaleInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallMoneyFlows) ? mallMoneyFlows.size() : 0);
        apiSaleInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallAchieveRecords) ? mallAchieveRecords.size() : 0);

        // todo 提现部分暂无
        List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
        apiSaleInfoVo.setTotalCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);

        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(id);
        apiSaleInfoVo.setAvaAmount(mallMemberWallet.getCommission());

        return new FebsResponse().success().data(apiSaleInfoVo);
    }
@@ -85,23 +93,16 @@
        if(CollUtil.isEmpty(mallMembers)){
            apiTeamHeaderInfoVo.setTotalCnt(0);
            apiTeamHeaderInfoVo.setTotalAmount(BigDecimal.ZERO);
        }else{
        }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)
                );
            }
            apiTeamHeaderInfoVo.setTotalAmount(
                    CollUtil.isNotEmpty(mallAchieveRecords)
                            ? mallAchieveRecords.stream().map(MallAchieveRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                            : BigDecimal.ZERO);
        }
        return new FebsResponse().success().data(apiTeamHeaderInfoVo);
    }
@@ -123,16 +124,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 +145,192 @@
        Page<ApiSaleListInfoVo> mallAchieveRecordPage = this.baseMapper.selectSalePage(objectPage, dto);
        return new FebsResponse().success().data(mallAchieveRecordPage);
    }

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

        // 获取当前登录用户的ID
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember mallMember = this.baseMapper.selectById(memberId);

        List<HappySaleLevel> happySaleLevels = happySaleLevelMapper.selectList(
                new LambdaQueryWrapper<HappySaleLevel>()
                        .orderByAsc(HappySaleLevel::getCode)
        );

        List<MallMember> directMembers = mallMemberMapper.selectByRefererId(mallMember.getInviteId());
        List<MallMember> teamMembers = mallMemberMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId());
        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectList(
                new LambdaQueryWrapper<MallAchieveRecord>()
                        .eq(MallAchieveRecord::getMemberId, memberId)
        );
        if (CollUtil.isNotEmpty(happySaleLevels)) {
            happySaleLevels.forEach(happySaleLevel -> {
                ApiLevelListInfoVo apiLevelListInfoVo = new ApiLevelListInfoVo();
                apiLevelListInfoVo.setName(happySaleLevel.getName());
                apiLevelListInfoVo.setMemberCode(mallMember.getStoreMaster());
                apiLevelListInfoVo.setCode(happySaleLevel.getCode());
                apiLevelListInfoVo.setContent(happySaleLevel.getContent());
                apiLevelListInfoVo.setHeaderPng(happySaleLevel.getHeaderPng());
                apiLevelListInfoVo.setTeamCnt(happySaleLevel.getTeamCnt());
                apiLevelListInfoVo.setTeamCntNow(CollUtil.isNotEmpty(teamMembers) ? teamMembers.size() : 0);
                apiLevelListInfoVo.setDirectCnt(happySaleLevel.getDirectCnt());
                apiLevelListInfoVo.setDirectCntNow(CollUtil.isNotEmpty(directMembers) ? directMembers.size() : 0);
                apiLevelListInfoVo.setTeamAmount(happySaleLevel.getTeamAmount());
                apiLevelListInfoVo.setTeamAmountNow(
                        CollUtil.isNotEmpty(mallAchieveRecords)
                                ? mallAchieveRecords.stream().map(MallAchieveRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
                                : BigDecimal.ZERO);
                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);
    }

    @Override
    public FebsResponse memberLevelList() {
        ArrayList<ApiMemberLevelListInfoVo> apiLevelListInfoVos = new ArrayList<>();

        // 获取当前登录用户的ID
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember mallMember = this.baseMapper.selectById(memberId);
        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);

        List<HappyMemberLevel> happyMemberLevels = happyMemberLevelMapper.selectList(
                new LambdaQueryWrapper<HappyMemberLevel>()
                        .orderByAsc(HappyMemberLevel::getCode)
        );
        //Stream  操作 happyMemberLevels，返回一个Map<code,HappyMemberLevel>
        Map<Integer, HappyMemberLevel> happyMemberLevelMap = happyMemberLevels.stream()
                .collect(Collectors.toMap(HappyMemberLevel::getCode, happyMemberLevel -> happyMemberLevel));
        if (CollUtil.isNotEmpty(happyMemberLevels)) {
            int mostSignIn = 1;
            DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                    DataDictionaryEnum.SCORE_SIGN_SETTING.getType(),
                    DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
            if (dic != null) {
                ScoreSettingDto scoreSettingDto = JSONObject.parseObject(dic.getValue(), ScoreSettingDto.class);
                mostSignIn = ObjectUtil.isEmpty(scoreSettingDto.getMostSignIn()) ? 1 : scoreSettingDto.getMostSignIn();
            }
            for (HappyMemberLevel happyMemberLevel : happyMemberLevels) {
                ApiMemberLevelListInfoVo vo = new ApiMemberLevelListInfoVo();
                BeanUtil.copyProperties(happyMemberLevel, vo);
                vo.setMostSignIn(mostSignIn);
                vo.setMemberCode(mallMember.getDirector());
                vo.setMemberScore(mallMemberWallet.getScore());
                vo.setUpgradeScore(
                        ObjectUtil.isEmpty(happyMemberLevelMap.get(happyMemberLevel.getCode())) ?
                                0 : happyMemberLevelMap.get(happyMemberLevel.getCode()).getUpgradeScore()
                );
                apiLevelListInfoVos.add(vo);
            }
        }
        return new FebsResponse().success().data(apiLevelListInfoVos);
    }


}