From 10d71b27f3e10efba9b8fb4c47ddc226ef21a3aa Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 05 Feb 2024 10:31:08 +0800
Subject: [PATCH] 确认收货更新用户的会员信息

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |  214 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 112 insertions(+), 102 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 94871f7..7bdf4dd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -825,15 +825,23 @@
         List<MallMember> secondLevelRecord = getStarRecord(thirdLevelRecord,  MemberLevelEnum.SECOND_LEVEL.name(), amount, orderNo, 0L,MoneyFlowTypeEnum.STAR_PERK_TWO.getValue());
     }
         public static void main(String[] args) {
-            Long number = 0L; // 这里可以替换成你需要检查的数字
-            if (number % 3 == 0) {
-                System.out.println(number + " 可以被3整除");
-            } else {
-                System.out.println(number + " 不能被3整除");
+//            Long number = 0L; // 这里可以替换成你需要检查的数字
+//            if (number % 3 == 0) {
+//                System.out.println(number + " 可以被3整除");
+//            } else {
+//                System.out.println(number + " 不能被3整除");
+//            }
+//
+//            DateTime nowTimeFormat = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
+//            System.out.println(nowTimeFormat);
+            BigDecimal bigDecimal = new BigDecimal("1");
+            BigDecimal cycle = new BigDecimal("2");
+            BigDecimal remainder = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
+            System.out.println(remainder);
+            BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
+            if(remainderDirect.compareTo(BigDecimal.ONE) == 0){
+                System.out.println(remainderDirect);
             }
-
-            DateTime nowTimeFormat = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
-            System.out.println(nowTimeFormat);
         }
     @Override
     public void BuyToSell() {
@@ -901,106 +909,108 @@
                     mallMemberAmountMine.setTrendsNft(mallMemberAmountMine.getTrendsNft().add(profit));
                     mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountMine);
 
-
-                    /**
-                     * 更新用户上级收益,冻结7天,7天时间到期自动释放到动态钱包
-                     */
-                    Long memberId = mallProductBuy.getMemberId();
-                    MallMember mallMember = memberMapper.selectById(memberId);
-                    if(ObjectUtil.isNotEmpty(mallMember)){
-                        //直推
-                        String referrerId = mallMember.getReferrerId();
-                        MallMember directMember = memberMapper.selectInfoByInviteId(referrerId);
-                        if(ObjectUtil.isNotEmpty(directMember)){
-                            BigDecimal basicPerkDirectPercent = new BigDecimal(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                                    DataDictionaryEnum.BASIC_PERK_DIRECT.getType(),
-                                    DataDictionaryEnum.BASIC_PERK_DIRECT.getCode()
-                            ).getValue()).multiply(new BigDecimal("0.01"));
-//                            BigDecimal basicPerkDirect = profit.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
-                            BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
-                            /**
-                             * 先插入流水记录,然后定时器每小时,循环一次找寻对应的数据执行
-                             */
-                            String orderNo = MallUtils.getOrderNum("DNFT");
-                            mallMoneyFlowService.addMoneyFlow(
-                                    directMember.getId(),
-                                    basicPerkDirect,
-                                    MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT.getValue(),
-                                    orderNo,
-                                    null,
-                                    FlowTypeNewEnum.NFT.getValue(),
-                                    MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT.getDescrition(),
-                                    AppContants.MEMBER_FLOW_ING);
-
-                            MallMemberAmount mallMemberAmountDirect = mallMemberAmountMapper.selectByMemberId(directMember.getId());
-                            mallMemberAmountDirect.setFrozenNft(mallMemberAmountDirect.getFrozenNft().add(basicPerkDirect));
-                            mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountDirect);
-                        }
-
+                    BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
+                    if(remainderDirect.compareTo(BigDecimal.ONE) == 0){
                         /**
-                         * 团队奖励
-                         *
+                         * 更新用户上级收益,冻结7天,7天时间到期自动释放到动态钱包
                          */
-                        String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
-                        BigDecimal equalsPerkBasic = BigDecimal.ZERO;//平级收益,假设平级,则算平级收益的百分比收益
-                        boolean flag = false;
-                        String parentId = mallMember.getReferrerId();
-                        if (StrUtil.isBlank(parentId)) {
-                            flag = true;
-                        }
-                        while (!flag) {
-                            MallMember mallMemberRef = memberMapper.selectInfoByInviteId(parentId);
-                            String levelRef = mallMemberRef.getLevel();
-                            //会员等级为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);
-                                if(compareLevel == 0){//团队奖励
-                                    BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
-                                            .multiply(new BigDecimal("0.01"));
-                                    BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
-                                    /**
-                                     * 先插入流水记录,然后定时器循环,找寻对应的数据执行
-                                     */
-                                    String orderNo = MallUtils.getOrderNum("TNFT");
+                        Long memberId = mallProductBuy.getMemberId();
+                        MallMember mallMember = memberMapper.selectById(memberId);
+                        if(ObjectUtil.isNotEmpty(mallMember)){
+                            //直推
+                            String referrerId = mallMember.getReferrerId();
+                            MallMember directMember = memberMapper.selectInfoByInviteId(referrerId);
+                            if(ObjectUtil.isNotEmpty(directMember)){
+                                BigDecimal basicPerkDirectPercent = new BigDecimal(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                                        DataDictionaryEnum.BASIC_PERK_DIRECT.getType(),
+                                        DataDictionaryEnum.BASIC_PERK_DIRECT.getCode()
+                                ).getValue()).multiply(new BigDecimal("0.01"));
+//                            BigDecimal basicPerkDirect = profit.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
+                                BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
+                                /**
+                                 * 先插入流水记录,然后定时器每小时,循环一次找寻对应的数据执行
+                                 */
+                                String orderNo = MallUtils.getOrderNum("DNFT");
+                                mallMoneyFlowService.addMoneyFlow(
+                                        directMember.getId(),
+                                        basicPerkDirect,
+                                        MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT.getValue(),
+                                        orderNo,
+                                        null,
+                                        FlowTypeNewEnum.NFT.getValue(),
+                                        MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT.getDescrition(),
+                                        AppContants.MEMBER_FLOW_ING);
 
-                                    if(teamPerk.compareTo(BigDecimal.ZERO) > 0){
-                                        insertFlowUpdateFrozenNft(
-                                                orderNo,
-                                                mallMemberRef.getId(),
-                                                teamPerk,
-                                                MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getValue(),
-                                                FlowTypeNewEnum.NFT.getValue(),
-                                                MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getDescrition(),
-                                                AppContants.MEMBER_FLOW_ING);
-                                    }
-                                    equalsPerkBasic = teamPerk;
-                                    level = levelRef;
-                                }else if(compareLevel == 2){//平级奖励
-                                    BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent())
-                                            .multiply(new BigDecimal("0.01"));
-                                    BigDecimal equalsPerk = equalsPerkPercent.multiply(equalsPerkBasic).setScale(2,BigDecimal.ROUND_DOWN);
-                                    String orderNo = MallUtils.getOrderNum("PJNFT");
-                                    if(equalsPerk.compareTo(BigDecimal.ZERO) > 0){
-                                        insertFlowUpdateFrozenNft(
-                                                orderNo,
-                                                mallMemberRef.getId(),
-                                                equalsPerk,
-                                                MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getValue(),
-                                                FlowTypeNewEnum.NFT.getValue(),
-                                                MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getDescrition(),
-                                                AppContants.MEMBER_FLOW_ING);
-                                    }
-                                    equalsPerkBasic = equalsPerk;
-                                }
+                                MallMemberAmount mallMemberAmountDirect = mallMemberAmountMapper.selectByMemberId(directMember.getId());
+                                mallMemberAmountDirect.setFrozenNft(mallMemberAmountDirect.getFrozenNft().add(basicPerkDirect));
+                                mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountDirect);
                             }
-                            parentId = mallMemberRef.getReferrerId();
-                            if (StrUtil.isBlank(mallMemberRef.getReferrerId())) {
+
+                            /**
+                             * 团队奖励
+                             *
+                             */
+                            String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
+                            BigDecimal equalsPerkBasic = BigDecimal.ZERO;//平级收益,假设平级,则算平级收益的百分比收益
+                            boolean flag = false;
+                            String parentId = mallMember.getReferrerId();
+                            if (StrUtil.isBlank(parentId)) {
                                 flag = true;
                             }
+                            while (!flag) {
+                                MallMember mallMemberRef = memberMapper.selectInfoByInviteId(parentId);
+                                String levelRef = mallMemberRef.getLevel();
+                                //会员等级为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);
+                                    if(compareLevel == 0){//团队奖励
+                                        BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
+                                                .multiply(new BigDecimal("0.01"));
+                                        BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
+                                        /**
+                                         * 先插入流水记录,然后定时器循环,找寻对应的数据执行
+                                         */
+                                        String orderNo = MallUtils.getOrderNum("TNFT");
+
+                                        if(teamPerk.compareTo(BigDecimal.ZERO) > 0){
+                                            insertFlowUpdateFrozenNft(
+                                                    orderNo,
+                                                    mallMemberRef.getId(),
+                                                    teamPerk,
+                                                    MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getValue(),
+                                                    FlowTypeNewEnum.NFT.getValue(),
+                                                    MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getDescrition(),
+                                                    AppContants.MEMBER_FLOW_ING);
+                                        }
+                                        equalsPerkBasic = teamPerk;
+                                        level = levelRef;
+                                    }else if(compareLevel == 2){//平级奖励
+                                        BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent())
+                                                .multiply(new BigDecimal("0.01"));
+                                        BigDecimal equalsPerk = equalsPerkPercent.multiply(equalsPerkBasic).setScale(2,BigDecimal.ROUND_DOWN);
+                                        String orderNo = MallUtils.getOrderNum("PJNFT");
+                                        if(equalsPerk.compareTo(BigDecimal.ZERO) > 0){
+                                            insertFlowUpdateFrozenNft(
+                                                    orderNo,
+                                                    mallMemberRef.getId(),
+                                                    equalsPerk,
+                                                    MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getValue(),
+                                                    FlowTypeNewEnum.NFT.getValue(),
+                                                    MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getDescrition(),
+                                                    AppContants.MEMBER_FLOW_ING);
+                                        }
+                                        equalsPerkBasic = equalsPerk;
+                                    }
+                                }
+                                parentId = mallMemberRef.getReferrerId();
+                                if (StrUtil.isBlank(mallMemberRef.getReferrerId())) {
+                                    flag = true;
+                                }
+                            }
                         }
                     }
                 }

--
Gitblit v1.9.1