From 61fa5c937f9fc59258a6e7f6dfdcb8ac941cb70f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 May 2023 10:09:29 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index a9dd40e..bb23b90 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -135,12 +135,14 @@
         DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
 
         if (member == null) {
+            String referenceID = null;
             if (!"asdf4321".equals(connectDto.getInviteId())) {
 //                DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
                 DappMemberEntity parent = dappMemberDao.selectByAddress(connectDto.getInviteId(), null);
                 if (parent == null) {
                     throw new FebsException("recommender is not exist");
                 }
+                referenceID = parent.getInviteId();
 
 //                List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1, null);
 //                if (child.size() == 6) {
@@ -149,7 +151,7 @@
             } else {
                 connectDto.setInviteId(null);
             }
-            member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+            member = insertMember(connectDto.getAddress(), referenceID);
             //升级用户的代理等级
 //            DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
 //            chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
@@ -193,6 +195,9 @@
         }
 
         return 3;
+    }
+
+    public static void main(String[] args) {
     }
 
     @Override
@@ -518,6 +523,13 @@
         );
         BigDecimal ausdPercent = new BigDecimal(ausdPercentDic.getValue());
         dappMemberInfoVo.setAusdtFee(ausdPercent);
+
+        DataDictionaryCustom aroundFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getType(),
+                PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getCode()
+        );
+        BigDecimal aroundFee = new BigDecimal(aroundFeeDic.getValue());
+        dappMemberInfoVo.setAroundFee(aroundFee);
         //ausd价格
         DataDictionaryCustom ausdPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                 PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),

--
Gitblit v1.9.1