From 206ed802e8c17ef105af21a8874af98895289176 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Dec 2022 16:00:56 +0800
Subject: [PATCH] 20221213转币
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 6 +++++-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 7 +++++--
2 files changed, 10 insertions(+), 3 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 78eb160..14f6a61 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
@@ -150,8 +150,8 @@
}
member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
//升级用户的代理等级
- DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
- chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
+// DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+// chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
@@ -369,6 +369,9 @@
if(ObjectUtil.isEmpty(dappSystemProfit)){
return null;
}
+ //升级用户的代理等级
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
+ chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
return buildTeamMatrix(member.getId());
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index f3c9f21..f69726f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -221,7 +221,11 @@
if (transferDto.getId() == null) {
DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type);
if(ObjectUtil.isNotEmpty(fundFlowOld)){
- throw new FebsException("Do not repeat purchase");
+ //网络问题导致第二次提交前，未成功就关闭了页面
+ if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
+ dappFundFlowDao.deleteById(transferDto.getId());
+ }
+ throw new FebsException("Refresh and try again");
}
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash());
dappFundFlowDao.insert(fundFlow);
--
Gitblit v1.9.1