From 22d018876ed1fa4e167e6b4823db1bfbd13d5579 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jun 2022 10:12:03 +0800
Subject: [PATCH] fix

---
 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 9ed7e57..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
@@ -124,7 +124,11 @@
         DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
 
         if (member == null) {
-            member = insertMember(connectDto.getAddress(), "0");
+            member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+        }
+
+        if (member.getActiveStatus() == 2) {
+            throw new FebsException("账号暂未激活,请联系推荐人");
         }
 
         String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
@@ -268,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));
 
@@ -283,6 +289,12 @@
 
         dappMemberDao.insert(member);
 
+        if (StrUtil.isEmpty(refererId)) {
+            refererId = "0";
+            // 若没有推荐人,则直接激活
+            member.setActiveStatus(1);
+        }
+
         member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
         member.setRefererId(refererId);
         if (StrUtil.isNotBlank(refererId)){

--
Gitblit v1.9.1