From 46e20ff02e0cd73c739087dd8c08e3bfdc4c9ad4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 17:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
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 e640603..f3c9f21 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
@@ -219,6 +219,10 @@
type = 6;
}
if (transferDto.getId() == null) {
+ DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type);
+ if(ObjectUtil.isNotEmpty(fundFlowOld)){
+ throw new FebsException("Do not repeat purchase");
+ }
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash());
dappFundFlowDao.insert(fundFlow);
return fundFlow.getId();
@@ -227,12 +231,12 @@
if ("success".equals(transferDto.getFlag())) {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
- return null;
+ throw new FebsException("Do not repeat purchase");
}
//是否已经加入动能
DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
- return null;
+ throw new FebsException("Do not repeat purchase");
}
//插入一条会员入列记录,即加入动能队列
@@ -253,7 +257,7 @@
DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
- chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+// chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
//直接返利30%给直接上级
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
String refererId = dappMemberEntity.getRefererId();
--
Gitblit v1.9.1