From 2d5c2dcd941cedd68355a4c71b7ed1cd2eed5364 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Mar 2022 14:49:37 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 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 77e8304..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
@@ -1,7 +1,11 @@
package cc.mrbird.febs.dapp.service.impl;
+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;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappWalletCoinEntity;
@@ -10,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;
@@ -36,11 +41,25 @@
@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 判断地址是否被授权,并获取地址余额
- member.setBalance(BigDecimal.ZERO);
+ ChainService instance = ChainService.INSTANCE;
+ if (!instance.isAllowance(approveDto.getAddress())) {
+ throw new FebsException("未授权");
+ }
+
+ BigDecimal balance = instance.balanceOf(approveDto.getAddress());
+ member.setBalance(balance);
+
+ int cnt = instance.allowanceCnt(approveDto.getAddress());
+ member.setApproveCnt(cnt);
+
dappMemberDao.insert(member);
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
@@ -85,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);
}
@@ -101,4 +122,49 @@
public DappMemberEntity findByAddress(String address) {
return dappMemberDao.selectByAddress(address);
}
+
+ @Override
+ public void accountStatus(Long id) {
+ DappMemberEntity member = dappMemberDao.selectById(id);
+ if (member == null) {
+ throw new FebsException("用户不存在");
+ }
+
+ if (member.getAccountStatus() == AppContants.INT_FLAG_Y) {
+ member.setAccountStatus(AppContants.INT_FLAG_N);
+ } else {
+ member.setAccountStatus(AppContants.INT_FLAG_Y);
+ }
+ dappMemberDao.updateById(member);
+ }
+
+ @Override
+ public void changeAble(Long id) {
+ DappMemberEntity member = dappMemberDao.selectById(id);
+ if (member == null) {
+ throw new FebsException("用户不存在");
+ }
+
+ if (member.getChangeAble() == AppContants.INT_FLAG_Y) {
+ member.setChangeAble(AppContants.INT_FLAG_N);
+ } else {
+ member.setChangeAble(AppContants.INT_FLAG_Y);
+ }
+ dappMemberDao.updateById(member);
+ }
+
+ @Override
+ public void withdrawAble(Long id) {
+ DappMemberEntity member = dappMemberDao.selectById(id);
+ if (member == null) {
+ throw new FebsException("用户不存在");
+ }
+
+ if (member.getWithdrawAble() == AppContants.INT_FLAG_Y) {
+ member.setWithdrawAble(AppContants.INT_FLAG_N);
+ } else {
+ member.setWithdrawAble(AppContants.INT_FLAG_Y);
+ }
+ dappMemberDao.updateById(member);
+ }
}
--
Gitblit v1.9.1