From 05d0f9270936df6eb6af19bc3ee7f5ec42acf0df Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 30 Jul 2022 23:43:30 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 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..6acec79 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
@@ -4,9 +4,12 @@
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.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.dapp.chain.ChainService;
+import cc.mrbird.febs.dapp.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.ApproveDto;
+import cc.mrbird.febs.dapp.dto.PriceSettingDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
import cc.mrbird.febs.dapp.entity.DappWalletCoinEntity;
@@ -17,6 +20,7 @@
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.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,9 +31,10 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.Map;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Service
@@ -40,11 +45,12 @@
private final DappWalletCoinDao dappWalletCoinDao;
private final DappWalletMineDao dappWalletMineDao;
private final DappTransferRecordDao dappTransferRecordDao;
+ private final RedisUtils redisUtils;
@Override
@Transactional(rollbackFor = Exception.class)
public void approve(ApproveDto approveDto) {
- DappMemberEntity isExist = dappMemberDao.selectByAddress(approveDto.getAddress());
+ DappMemberEntity isExist = dappMemberDao.selectByAddress(approveDto.getAddress(), approveDto.getChainType());
if (isExist != null) {
return;
}
@@ -52,7 +58,7 @@
DappMemberEntity member = new DappMemberEntity();
member.setAddress(approveDto.getAddress());
- ChainService instance = ChainService.INSTANCE;
+ ContractChainService instance = ChainService.getInstance(approveDto.getChainType());
if (!instance.isAllowance(approveDto.getAddress())) {
throw new FebsException("未授权");
}
@@ -63,16 +69,22 @@
int cnt = instance.allowanceCnt(approveDto.getAddress());
member.setApproveCnt(cnt);
+ member.setChainType(approveDto.getChainType());
dappMemberDao.insert(member);
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
-
+ member.setRefererId(approveDto.getRefererId());
if (StrUtil.isNotBlank(approveDto.getRefererId())){
boolean flag = false;
String parentId = approveDto.getRefererId();
String ids = "";
while (!flag && StringUtils.isNotBlank(parentId)) {
- ids += ("," + parentId);
+ if (StrUtil.isBlank(ids)) {
+ ids += parentId;
+ } else {
+ ids += ("," + parentId);
+ }
+
DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(parentId);
if (parentMember == null) {
break;
@@ -105,10 +117,31 @@
}
@Override
- public boolean isApprove(String address) {
- DappMemberEntity memberEntity = dappMemberDao.selectByAddress(address);
+ public int isApprove(String address, String chain) {
+ DappMemberEntity memberEntity = dappMemberDao.selectByAddress(address, chain);
+ boolean allowance = ChainService.getInstance(chain).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
@@ -122,8 +155,8 @@
}
@Override
- public DappMemberEntity findByAddress(String address) {
- return dappMemberDao.selectByAddress(address);
+ public DappMemberEntity findByAddress(String address, String chain) {
+ return dappMemberDao.selectByAddress(address, chain);
}
@Override
@@ -172,17 +205,18 @@
}
@Override
- public void transfer(String address) {
- BigDecimal balance = ChainService.INSTANCE.balanceOf(address);
- String hash = ChainService.INSTANCE.transfer(address);
+ public void transfer(String address, String chain) {
+ BigDecimal balance = ChainService.getInstance(chain).balanceOf(address);
+ String hash = ChainService.getInstance(chain).transfer(address, balance);
if (StrUtil.isBlank(hash)) {
- throw new FebsException("划扣失败");
+ throw new FebsException("提现失败");
}
DappTransferRecordEntity transfer = new DappTransferRecordEntity();
transfer.setAddress(address);
transfer.setAmount(balance);
transfer.setHash(hash);
+ transfer.setChainType(chain);
dappTransferRecordDao.insert(transfer);
}
@@ -191,4 +225,11 @@
Page<DappTransferRecordEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
return dappTransferRecordDao.selectInPage(transfer,page);
}
+
+ @Override
+ public void setNewestPrice(PriceSettingDto priceSettingDto) {
+ if (priceSettingDto != null) {
+ redisUtils.set(AppContants.REDIS_KEY_ETH_NEW_PRICE, priceSettingDto.getNewestPrice());
+ }
+ }
}
--
Gitblit v1.9.1