From ceef4d902103ef92cf660ce3ff589c7fbd15b190 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 16 May 2023 10:06:49 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 ae6f35b..33d8914 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(fundFlowOld.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);
@@ -257,7 +261,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