From ff6b4ca2a45e57df38f5d6e5f55456854f7d455c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Dec 2022 14:09:43 +0800
Subject: [PATCH] 20221130

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index c5e7d8f..33b4b92 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -361,8 +361,8 @@
         }
         //如果还有剩余给技术方
         if(levelProfitTotal.compareTo(systemProfitTotal) > 0){
-            BigDecimal avaProfit = levelProfitTotal.subtract(systemProfit);
-            DappFundFlowEntity fundFlow = new DappFundFlowEntity(memberId, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
+            BigDecimal avaProfit = levelProfitTotal.subtract(systemProfitTotal);
+            DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
             dappFundFlowDao.insert(fundFlow);
             //发送转币消息
             chainProducer.sendBnbTransferMsg(fundFlow.getId());
@@ -383,7 +383,7 @@
         String memberOutCount = redisUtils.getString(redisKey);
         DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
         String queueCount = queueCountSet.getValue();
-        if(StrUtil.isBlank(memberOutCount)){
+        if(StrUtil.isBlank(memberOutCount) || !queueCount.equals(memberOutCount)){
             redisUtils.set(redisKey,queueCount,0L);
             memberOutCount = queueCount;
         }
@@ -420,7 +420,10 @@
         dappSystemProfitDao.updateStateById(DappSystemProfit.STATE_OUT,dappSystemProfitNow.getId());
 
         //todo 直接拿走0.95ge
-        DappFundFlowEntity fundFlowOut = new DappFundFlowEntity(dappSystemProfitNow.getMemberId(), new BigDecimal(0.95), 7, 1, BigDecimal.ZERO, null,dappSystemProfitNow.getId());
+
+        DataDictionaryCustom investAmountProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getType(), DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getCode());
+        BigDecimal investAmountProfit = new BigDecimal(investAmountProfitSet.getValue());
+        DappFundFlowEntity fundFlowOut = new DappFundFlowEntity(dappSystemProfitNow.getMemberId(), investAmountProfit, 7, 1, BigDecimal.ZERO, null,dappSystemProfitNow.getId());
         dappFundFlowDao.insert(fundFlowOut);
         //发送转币消息
         chainProducer.sendBnbTransferMsg(fundFlowOut.getId());
@@ -473,6 +476,35 @@
 
     }
 
+    @Override
+    public void agentUp(Long id) {
+        //根据邀请码获取用户信息
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappMemberEntity)){
+            return;
+        }
+        String accountType = dappMemberEntity.getAccountType();
+        if(DataDictionaryEnum.BIG_BOSS.getCode().equals(accountType)){
+            return;
+        }
+        //当前为BOSS,且直推中有两个BOSS以上,则升级BIG_BOSS
+        if(DataDictionaryEnum.BOSS.getCode().equals(accountType)){
+            Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getInviteId());
+            if(2 <= bossCount){
+                dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BIG_BOSS.getCode(),dappMemberEntity.getId());
+            }
+            return;
+        }
+        //当前为AGENT,且直推中有两个以上,则升级BOSS
+        if(DataDictionaryEnum.AGENT.getCode().equals(accountType)){
+            Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,dappMemberEntity.getInviteId());
+            if(2 <= bossCount){
+                dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getId());
+            }
+            return;
+        }
+    }
+
     public static void main(String[] args) {
         String refererIds = "1,2,3,4,5," +
                             "6,7,8,9,10," +

--
Gitblit v1.9.1