From f57f90fca65d8d5e42ec040e99dba9d8789e2abf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jun 2022 10:21:17 +0800
Subject: [PATCH] 账户信息数据接口 新增字段

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 9e447f9..acc3067 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
@@ -13,9 +13,11 @@
 import cc.mrbird.febs.dapp.dto.ApproveDto;
 import cc.mrbird.febs.dapp.dto.ConnectDto;
 import cc.mrbird.febs.dapp.dto.PriceSettingDto;
+import cc.mrbird.febs.dapp.dto.TeamListDto;
 import cc.mrbird.febs.dapp.entity.*;
 import cc.mrbird.febs.dapp.mapper.*;
 import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.vo.TeamListVo;
 import cc.mrbird.febs.system.entity.User;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -28,6 +30,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -121,7 +124,11 @@
         DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
 
         if (member == null) {
-            member = insertMember(connectDto.getAddress(), null);
+            member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+        }
+
+        if (member.getActiveStatus() == 2) {
+            throw new FebsException("账号暂未激活,请联系推荐人");
         }
 
         String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
@@ -265,6 +272,8 @@
         member.setAddress(address);
         member.setChainType(chainType);
         member.setAccountType(accountType);
+        // 如果有推荐人,则需要推荐人转币后激活
+        member.setActiveStatus(2);
         member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
         member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
 
@@ -279,6 +288,12 @@
         }
 
         dappMemberDao.insert(member);
+
+        if (StrUtil.isEmpty(refererId)) {
+            refererId = "0";
+            // 若没有推荐人,则直接激活
+            member.setActiveStatus(1);
+        }
 
         member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
         member.setRefererId(refererId);
@@ -311,4 +326,10 @@
 
         return member;
     }
+
+    @Override
+    public List<TeamListVo> findTeamList(TeamListDto teamListDto) {
+
+        return new ArrayList<>();
+    }
 }

--
Gitblit v1.9.1