From f088029faca4a41abb21b2ec4974caafe91ef7f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 04 Aug 2022 18:08:32 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 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 175bbae..344baa4 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
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.dapp.service.impl;
 
+import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
 import cc.mrbird.febs.common.contants.AppContants;
 import cc.mrbird.febs.common.entity.QueryRequest;
 import cc.mrbird.febs.common.exception.FebsException;
@@ -120,16 +121,18 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void connect(ConnectDto connectDto) {
         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(), connectDto.getInviteId());
+            throw new FebsException(MessageSourceUtils.getString("system_regist_error"));
+//            member = insertMember(connectDto.getAddress(), null);
         }
 
 //        if (member.getActiveStatus() == 2) {
@@ -276,8 +279,7 @@
         member.setAddress(address);
         member.setChainType(chainType);
         member.setAccountType(accountType);
-        // 如果有推荐人,则需要推荐人转币后激活
-        member.setActiveStatus(2);
+        member.setActiveStatus(1);
         member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
         member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
 
@@ -290,9 +292,12 @@
         } else {
             member.setNodeType(2);
         }
-
         dappMemberDao.insert(member);
 
+        DappWalletCoinEntity walletCoin = new DappWalletCoinEntity();
+        walletCoin.setMemberId(member.getId());
+        dappWalletCoinDao.insert(walletCoin);
+
         if (StrUtil.isEmpty(refererId)) {
             refererId = "0";
             // 若没有推荐人,则直接激活

--
Gitblit v1.9.1