关闭订单确认赠送GFD

KKSU

2024-05-24 b922c159f4791e940ff4b017848e4998d3b44e1b

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

@@ -60,7 +60,6 @@
    private final MallProductNftMapper mallProductNftMapper;
    private final AgentProducer agentProducer;
    private final MallMemberAmountMapper mallMemberAmountMapper;
    private final IMemberProfitService iMemberProfitService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -1054,6 +1053,56 @@
        }
    }

    public void createPerk(MallMember mallMember,BigDecimal basicPerkDirect){
        /**
         * 如果用户是冻结，则直接销毁
         */
        Integer isFrozen = mallMember.getIsFrozen();
        if(ProductEnum.MEMBER_FROZEN.getValue() == isFrozen){
            MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
            if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect)) >= 0){
                return;
            }
            mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect));
            mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmountMine);
            //插入一条流水记录
            String orderNo = MallUtils.getOrderNum("FNFTW");
            mallMoneyFlowService.addMoneyFlow(
                    mallMember.getId(),
                    basicPerkDirect.negate(),
                    MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
                    orderNo,
                    null,
                    FlowTypeNewEnum.NFT.getValue(),
                    MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
                    AppContants.MEMBER_FLOW_ING);

        }else {
            MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
            if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect)) >= 0){
                return;
            }
            mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect));
            mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountMine);

            MallMemberAmount mallMemberAmountNft = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
            mallMemberAmountNft.setTrendsNft(mallMemberAmountNft.getTrendsNft().add(basicPerkDirect));
            mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountNft);

            //插入一条流水记录
            String orderNo = MallUtils.getOrderNum("NFT");
            mallMoneyFlowService.addMoneyFlow(
                    mallMember.getId(),
                    basicPerkDirect,
                    MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getValue(),
                    orderNo,
                    null,
                    FlowTypeNewEnum.NFT.getValue(),
                    MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getDescrition(),
                    AppContants.MEMBER_FLOW_DONE);
        }
    }

    @Override
    public void BuyToSellV2() {
        List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectListByStateAndMateState(
@@ -1182,10 +1231,10 @@
                                /**
                                 * 如果用户是冻结，则直接销毁
                                 */
                                iMemberProfitService.createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
                                createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
                                if(StrUtil.isNotEmpty(directMember.getReferrerId())){
                                    MallMember directMemberDirect = memberMapper.selectInfoByInviteId(directMember.getReferrerId());
                                    iMemberProfitService.createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
                                    createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
                                }
                            }
                        }
@@ -1207,12 +1256,20 @@
                            //会员等级为ZERO_LEVEL，则不参与团队返佣
                            if(!MemberLevelNewEnum.ZERO_LEVEL.getType().equals(levelRef)){
                                int compareLevel = MemberLevelNewEnum.ZERO_LEVEL.compareLevel(level, levelRef);

                                DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                        levelRef, levelRef
                                );
                                TeamPerkDto teamPerkDto = JSONObject.parseObject(dataDictionaryCustom.getValue(), TeamPerkDto.class);

                                DataDictionaryCustom dataDictionaryCustomLevel = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                        level, level
                                );
                                TeamPerkDto teamPerkDtoLevel = JSONObject.parseObject(dataDictionaryCustomLevel.getValue(), TeamPerkDto.class);
                                if(compareLevel == 0){//团队奖励
                                    BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
                                    BigDecimal subtract = new BigDecimal(teamPerkDto.getPerkPercent()).subtract(new BigDecimal(teamPerkDtoLevel.getPerkPercent()));

                                    BigDecimal PerkPercent = subtract
                                            .multiply(new BigDecimal("0.01"));
                                    BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
                                    /**
@@ -1942,7 +1999,7 @@
                Integer directCntLevel = teamPerkDto.getDirectCnt();
                Integer teamCnt = teamPerkDto.getTeamCnt();
                if(directCntLevel <= intersection.size()){
                    List<MallMember> mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(level,mallMemberRef.getId());
                    List<MallMember> mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(level,mallMemberRef.getInviteId());
                    if(teamCnt <= (CollUtil.isEmpty(mallMembersAll) ? 0 : mallMembersAll.size())){
                        mallMemberRef.setLevel(level);
                        memberMapper.updateById(mallMemberRef);