fix

Helius

2022-04-24 0a32a50a7d35a7865e70623bde75f7579585f515

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java

@@ -6,6 +6,7 @@
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.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
@@ -29,7 +30,7 @@
import java.math.BigDecimal;

/**
 * @author wzy
 * @author 
 * @date 2022-03-17
 **/
@Service
@@ -44,7 +45,7 @@
    @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 +53,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 +64,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 +112,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 +150,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,9 +200,9 @@
    }

    @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("提现失败");
        }
@@ -183,6 +211,7 @@
        transfer.setAddress(address);
        transfer.setAmount(balance);
        transfer.setHash(hash);
        transfer.setChainType(chain);
        dappTransferRecordDao.insert(transfer);
    }