From f5421991e02d1f146e9628bb1aa1d859519e0230 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Mar 2022 14:44:02 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 7b308d1..3153396 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
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.dto.ApproveDto;
@@ -13,6 +14,7 @@
import cc.mrbird.febs.dapp.mapper.DappWalletCoinDao;
import cc.mrbird.febs.dapp.mapper.DappWalletMineDao;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -39,10 +41,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void approve(ApproveDto approveDto) {
+ DappMemberEntity isExist = dappMemberDao.selectByAddress(approveDto.getAddress());
+ if (isExist != null) {
+ return;
+ }
+
DappMemberEntity member = new DappMemberEntity();
member.setAddress(approveDto.getAddress());
-
- // TODO 判断地址是否被授权，并获取地址余额
ChainService instance = ChainService.INSTANCE;
if (!instance.isAllowance(approveDto.getAddress())) {
@@ -99,15 +104,17 @@
@Override
public boolean isApprove(String address) {
DappMemberEntity memberEntity = dappMemberDao.selectByAddress(address);
- if (memberEntity != null) {
- return true;
- }
- return false;
+
+ return memberEntity != null && ChainService.INSTANCE.isAllowance(address);
}
@Override
public IPage<DappMemberEntity> selectInPage(DappMemberEntity member, QueryRequest request) {
Page<DappMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ User currentUser = FebsUtil.getCurrentUser();
+ if (currentUser.getDeptId() == null) {
+ member.setCurrentUser(currentUser.getUserId());
+ }
return dappMemberDao.selectInPage(member, page);
}
--
Gitblit v1.9.1