feat(mall): 为 ApiGrowChargeDto 中的 amount 字段添加 NotNull 注解

KKSU

2025-01-03 5d9b16b455079407acdcff587d6152ef6cb6bc55

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

@@ -60,6 +60,7 @@

    private final AsyncService asyncService;
    private final FebsConfigure febsConfigure;
    private final RunVipGrowMapper runVipGrowMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -643,6 +644,32 @@
                    }
                    V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
                }
                //会员权益的收益
                RunVipGrow runVipGrow = runVipGrowMapper.selectList(
                        new LambdaQueryWrapper<RunVipGrow>()
                                .eq(RunVipGrow::getMemberId, item.getId())
                                .eq(RunVipGrow::getLevelNow, runVip.getVipCode())
                                .orderByDesc(RunVipGrow::getId)
                ).stream().findFirst().orElse(null);
                if(null != runVipGrow){
                    BigDecimal amountNow = runVipGrow.getAmountNow();
                    RunVip runVipNext = runVips.stream().filter(vipItem -> vipItem.getOrderNumber() == runVip.getOrderNumber() + 1).findFirst().orElse(null);
                    if(runVipNext != null){
                        BigDecimal presentPrice = runVip.getPresentPrice();
                        BigDecimal presentPriceNext = runVipNext.getPresentPrice();
                        BigDecimal subtract = presentPriceNext.subtract(presentPrice);

                        BigDecimal divide = amountNow.divide(subtract, 4, RoundingMode.DOWN);

                        Integer growthCnt = runVip.getGrowthCnt();
                        Integer growthCntNext = runVipNext.getGrowthCnt();
                        int growthNum = growthCntNext - growthCnt;

                        BigDecimal growthAmountTotal = divide.multiply(new BigDecimal(growthNum));
                        BigDecimal growthAmount = growthAmountTotal.divide(new BigDecimal(C1), 0, RoundingMode.DOWN);
                        V3 = V3.add(growthAmount);
                    }
                }
                //更新钱包数据
                if(V3.intValue() <= 0){
                    continue;
@@ -857,24 +884,28 @@
        }
        //获取节点设置
        List<RunNodeSet> runNodeSets = runNodeSetMapper.selectList(null);
        BigDecimal balanceToCoin = new BigDecimal(
                dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getType(),
                        RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getCode()).getValue()
        ).setScale(2, BigDecimal.ROUND_DOWN);

        //获取节点设置runNodeSets中orderNumber最小的节点
        RunNodeSet minRunNodeSet = runNodeSets.stream().min(Comparator.comparingInt(RunNodeSet::getOrderNumber)).orElse(null);
        if(null == minRunNodeSet){
            return;
        }

        DateTime endTime = DateUtil.date();
        for (MallMember item : mallMembers) {
            //获取总业绩
            BigDecimal achieve = getDirectAchieve(item.getInviteId(),item.getDirectorTime(),endTime);
            if(BigDecimal.ZERO.compareTo(achieve) >= 0){
            //判断总业绩是否小于最小业绩
            if(minRunNodeSet.getMinAchieve().compareTo(achieve) > 0){
                item.setDirector(YesOrNoEnum.NO.getValue());
                mallMemberMapper.updateById(item);
                continue;
            }
            BigDecimal nodePercent = getNodePercent(runNodeSets, achieve);
            if(BigDecimal.ZERO.compareTo(nodePercent) >= 0){
                continue;
            }
            asyncService.releaseNodeCoin(achieve,nodePercent,balanceToCoin,item.getId());
            asyncService.releaseNodeCoin(achieve,nodePercent,item.getId());
            item.setDirectorTime(endTime);
            mallMemberMapper.updateById(item);
        }
@@ -920,6 +951,9 @@
                new LambdaQueryWrapper<MallMember>()
                        .eq(MallMember::getReferrerId, inviteId)
        );
        if(CollUtil.isEmpty(directMembers)){
            return memberIds;
        }
        memberIds.addAll(directMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));

        // 获取团队成员
@@ -927,6 +961,10 @@
                new LambdaQueryWrapper<MallMember>()
                        .in(MallMember::getReferrerId, directMembers.stream().map(MallMember::getInviteId).collect(Collectors.toSet()))
        );

        if(CollUtil.isEmpty(teamMembers)){
            return memberIds;
        }
        memberIds.addAll(teamMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));

        return memberIds;