From deaf2b0b4ada3689e235754b61c9c34133c00157 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 27 Apr 2022 16:48:37 +0800
Subject: [PATCH] add member center some interface

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   55 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 20 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 42c478f..d2a96d2 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
@@ -56,19 +56,24 @@
         List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
         List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
         for (MallMember parent : parentMembers) {
+            // 未激活用户无法升级
+            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
+                continue;
+            }
+
             DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
             if (nextLevel == null) {
                 log.info("当前层级无下一级:{}", parent.getLevel());
-                return;
+                continue;
             }
 
             AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
             if (!orderCntFinish(parent, agentInfo)) {
-                return;
+                continue;
             }
 
             if (!agentCntFinish(parent, agentInfo)) {
-                return;
+                continue;
             }
 
             parent.setLevel(nextLevel.getCode());
@@ -102,7 +107,7 @@
      * @return
      */
     private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
-        if (agentInfo.getLastCnt() == null) {
+        if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
             return true;
         }
 
@@ -151,19 +156,24 @@
      */
     private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
         MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
+        if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
+            return;
+        }
+
+        BigDecimal returnMoney;
         if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
-            return;
-        }
+            returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount());
+        } else {
+            AgentInfo agentInfo = getAgentInfo(parent.getLevel());
+            if (agentInfo == null) {
+                return;
+            }
 
-        AgentInfo agentInfo = getAgentInfo(parent.getLevel());
-        if (agentInfo == null) {
-            return;
+            returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
         }
-
-        BigDecimal returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
         memberWalletService.addBalance(returnMoney, parent.getId());
 
-        memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
+//        memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
     }
 
     /**
@@ -172,7 +182,7 @@
      */
     public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
         List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
-        List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds);
+        List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId());
         if (CollUtil.isEmpty(agentList)) {
             return;
         }
@@ -180,6 +190,11 @@
         Map<String, Map<Long, BigDecimal>> needReturn = new HashMap<>();
         for (MallMember mallMember : agentList) {
             String level = mallMember.getLevel();
+
+            List<MallMember> bigLevel = memberMapper.selectMallMemberByInviteIdAndLevel(mallMember.getInviteId(),level);
+            if(CollUtil.isNotEmpty(bigLevel)){
+                continue;
+            }
 
             Map<Long, BigDecimal> amount = needReturn.get(level);
 
@@ -200,13 +215,13 @@
                 amount.put(mallMember.getId(), returnMoney);
             } else {
                 if (!AgentLevelEnum.SECOND_LEVEL.name().equals(mallMember.getLevel())) {
-                    amount.put(mallMember.getId(), BigDecimal.ONE);
+                    // 代理两级
+                    if (amount.size() >= 2) {
+                        continue;
+                    } else {
+                        amount.put(mallMember.getId(), BigDecimal.ONE);
+                    }
                 }
-            }
-
-            // 代理两级
-            if (amount.size() > 2) {
-                continue;
             }
 
             needReturn.put(level, amount);
@@ -220,7 +235,7 @@
             for (Map.Entry<Long, BigDecimal> amount : entry.getValue().entrySet()) {
                 memberWalletService.addBalance(amount.getValue(), amount.getKey());
 
-                memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
+//                memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
             }
         }
     }

--
Gitblit v1.9.1