在mq之前，先更新订单状态

xiaoyong931011

2023-04-07 26a8d4cf5c9b365c09f438c4c166e843542c5ace

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

@@ -17,10 +17,7 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -252,15 +249,76 @@
         * 3、团队下不同代理级别获取不用的比例的现金和积分
         */
        if(StrUtil.isNotEmpty(mallMember.getReferrerIds())){
            //团队补贴对象
            List<MallMember> mallMemberTeamPerk = new ArrayList<>();

            String referrerIds = mallMember.getReferrerIds();
            List<String> referrerIdList = StrUtil.splitTrim(referrerIds, ",");
            List<MallMember> mallMembers = mallMemberMapper.selectByInviteIds(referrerIdList);
            if(CollUtil.isNotEmpty(mallMembers)){
//                mallMembers.stream().
            if(CollUtil.isNotEmpty(referrerIdList)){
                List<MallMember> mallMembers = mallMemberMapper.selectByInviteIds(referrerIdList);
                /**
                 * 根据等级分组，获取对应的<级别，会员数组>map
                 */
                Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
                Set<String> set = collect.keySet(); // 得到所有key的集合
                for (String key : set) {
                    /**
                     * 团队补贴从v1到v6
                     */
                    int compareMin = MemberLevelEnum.V1.compareLevel(key, MemberLevelEnum.V1.getType());
                    int compareMax = MemberLevelEnum.V1.compareLevel(MemberLevelEnum.V6.getType(), key);
                    if(compareMin >= 1 && compareMax >= 1){
                        List<MallMember> value = collect.get(key);
                        mallMemberTeamPerk.add(value.get(0));
                    }
                }
            }

        }
            if(CollUtil.isNotEmpty(mallMemberTeamPerk)){
                String levelNormal = MemberLevelEnum.NORMAL.getType();
                BigDecimal cashPercentNormal = BigDecimal.ZERO;
                BigDecimal scorePercentNormal = BigDecimal.ZERO;
                for(MallMember teamPerkMember : mallMemberTeamPerk){
                    String level = teamPerkMember.getLevel();
                    //比较两个级别的大小，level大于levelNormal返回1
                    int compareLevel = MemberLevelEnum.V1.compareLevel(level, levelNormal);
                    if(compareLevel == 1){
                        Long teamPerkMemberId = teamPerkMember.getId();
                        DataDictionaryCustom teamPerkMemberDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                MemberLevelEnum.V1.getType(), level);

                        AdminAgentInfo adminAgentInfo = JSONObject.parseObject(teamPerkMemberDic.getValue(), AdminAgentInfo.class);
                        BigDecimal cashPercent = adminAgentInfo.getCashPercent().multiply(AppContants.PERCENTAGE);
                        BigDecimal scorePercent = adminAgentInfo.getScorePercent().multiply(AppContants.PERCENTAGE);
                        //极差
                        cashPercent = cashPercent.subtract(cashPercentNormal);
                        scorePercent = scorePercent.subtract(scorePercentNormal);

                        BigDecimal cashAmount = amountTC.multiply(cashPercent).setScale(2, BigDecimal.ROUND_DOWN);
                        BigDecimal scoreCnt = amountTC.multiply(scorePercent).setScale(2, BigDecimal.ROUND_DOWN);
                        if(cashAmount.compareTo(BigDecimal.ZERO) > 0){
                            addWalletInfoAndMoneyFlow(cashAmount,
                                    teamPerkMemberId,
                                    "balance",
                                    MoneyFlowTypeEnum.AGENT_CASH_PERK.getValue(),
                                    FlowTypeEnum.BALANCE.getValue(),
                                    orderNo);
                        }
                        if(scoreCnt.compareTo(BigDecimal.ZERO) > 0){
                            addWalletInfoAndMoneyFlow(scoreCnt,
                                    teamPerkMemberId,
                                    "score",
                                    MoneyFlowTypeEnum.AGENT_SCORE_PERK.getValue(),
                                    FlowTypeEnum.SCORE.getValue(),
                                    orderNo);
                        }
                        levelNormal = level;
                        cashPercentNormal = cashPercent;
                        scorePercentNormal = scorePercent;
                    }
                }
            }
        }

    }

@@ -283,18 +341,31 @@
            //获得数量
            BigDecimal perkEnumDicPercentPerk = perkEnumDicPercent.multiply(AppContants.PERCENTAGE).multiply(amountTC).setScale(2, BigDecimal.ROUND_DOWN);
            if(perkEnumDicPercentPerk.compareTo(BigDecimal.ZERO) > 0){
                //增加
                iApiMallMemberWalletService.add(perkEnumDicPercentPerk,memberId,walletField);
                //增加一个流水记录
                mallMoneyFlowService.addMoneyFlow(
                        memberId,
                        perkEnumDicPercentPerk,
                        type,
                        orderNo,
                        flowType,
                        AppContants.IS_RETURN_YES);
                addWalletInfoAndMoneyFlow(perkEnumDicPercentPerk,memberId,walletField,type,flowType,orderNo);
            }
        }
    }

    /**
     * 操作用户钱包数据，增加流水
     * @param amount
     * @param memberId
     * @param walletField
     * @param type
     * @param flowType
     * @param orderNo
     */
    private void addWalletInfoAndMoneyFlow(BigDecimal amount,Long memberId,String walletField,int type,int flowType,String orderNo){
        //增加
        iApiMallMemberWalletService.add(amount,memberId,walletField);
        //增加一个流水记录
        mallMoneyFlowService.addMoneyFlow(
                memberId,
                amount,
                type,
                orderNo,
                flowType,
                AppContants.IS_RETURN_YES);
    }

    /**
@@ -320,16 +391,7 @@
            if(perkEnumDicPercentPerk.compareTo(BigDecimal.ZERO) > 0){
                for(MallMember mallMember : mallMembers){
                    Long memberId = mallMember.getId();
                    //增加余额
                    iApiMallMemberWalletService.add(perkEnumDicPercentPerk,memberId,walletField);
                    //增加一个获得现金的流水记录
                    mallMoneyFlowService.addMoneyFlow(
                            memberId,
                            perkEnumDicPercentPerk,
                            type,
                            orderNo,
                            flowType,
                            AppContants.IS_RETURN_YES);
                    addWalletInfoAndMoneyFlow(perkEnumDicPercentPerk,memberId,walletField,type,flowType,orderNo);
                }
            }
        }