From 19a4e58671e39afaf0e89e9fd5b13f0c3851c595 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 13 Jul 2022 10:42:23 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 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 37201a8..c92fb2c 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
@@ -36,7 +36,7 @@
 import java.util.Map;
 
 /**
- * @author 
+ * @author
  * @date 2022-03-17
  **/
 @Service
@@ -77,7 +77,7 @@
 
         member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
         member.setRefererId(approveDto.getRefererId());
-        if (StrUtil.isNotBlank(approveDto.getRefererId())){
+        if (StrUtil.isNotBlank(approveDto.getRefererId())) {
             boolean flag = false;
             String parentId = approveDto.getRefererId();
             String ids = "";
@@ -93,7 +93,7 @@
                     break;
                 }
                 parentId = parentMember.getRefererId();
-                if(StringUtils.isBlank(parentId)){
+                if (StringUtils.isBlank(parentId)) {
                     break;
                 }
                 if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -124,17 +124,13 @@
         DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
 
         if (member == null) {
-//            DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
-//            if (parent == null) {
-//                throw new FebsException("邀请人不存在");
-//            }
+            DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+            if (parent == null) {
+                throw new FebsException("邀请人不存在");
+            }
 
             member = insertMember(connectDto.getAddress(), null);
         }
-
-//        if (member.getActiveStatus() == 2) {
-//            throw new FebsException("注册成功,账号暂未激活,请联系推荐人");
-//        }
 
         String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
         redisUtils.set(connectDto.getAddress(), member);
@@ -254,7 +250,7 @@
     @Override
     public IPage<DappTransferRecordEntity> selectTransferInPage(DappTransferRecordEntity transfer, QueryRequest request) {
         Page<DappTransferRecordEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return dappTransferRecordDao.selectInPage(transfer,page);
+        return dappTransferRecordDao.selectInPage(transfer, page);
     }
 
     @Override
@@ -300,7 +296,7 @@
 
         member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
         member.setRefererId(refererId);
-        if (StrUtil.isNotBlank(refererId)){
+        if (StrUtil.isNotBlank(refererId)) {
             boolean flag = false;
             String parentId = refererId;
             String ids = "";
@@ -329,7 +325,7 @@
                     break;
                 }
                 parentId = parentMember.getRefererId();
-                if(StringUtils.isBlank(parentId) || "0".equals(parentId)){
+                if (StringUtils.isBlank(parentId) || "0".equals(parentId)) {
                     break;
                 }
                 if (parentMember.getRefererId().equals(parentMember.getInviteId())) {

--
Gitblit v1.9.1