From 4d366b62e09fd9269222cd7b3dc37f5cbcef8c75 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 04 Apr 2022 12:46:30 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 a576235..af90a91 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
@@ -105,10 +105,31 @@
}
@Override
- public boolean isApprove(String address) {
+ public int isApprove(String address) {
DappMemberEntity memberEntity = dappMemberDao.selectByAddress(address);
+ boolean allowance = ChainService.INSTANCE.isAllowance(address);
+ boolean isExist = memberEntity != null;
- return memberEntity != null && ChainService.INSTANCE.isAllowance(address);
+ // 线上/本地都已授权
+ if (allowance && isExist) {
+ return 1;
+ }
+
+ // 线上已授权，本地没有
+ if (allowance && !isExist) {
+ return 2;
+ }
+
+ // 线上本地都没授权
+ if (!allowance && !isExist) {
+ return 3;
+ }
+
+ if (!allowance && isExist) {
+ return 4;
+ }
+
+ return 3;
}
@Override
@@ -174,9 +195,9 @@
@Override
public void transfer(String address) {
BigDecimal balance = ChainService.INSTANCE.balanceOf(address);
- String hash = ChainService.INSTANCE.transfer(address);
+ String hash = ChainService.INSTANCE.transfer(address, balance);
if (StrUtil.isBlank(hash)) {
- throw new FebsException("划扣失败");
+ throw new FebsException("提现失败");
}
DappTransferRecordEntity transfer = new DappTransferRecordEntity();
--
Gitblit v1.9.1