fix

Helius

2022-07-14 fbe58daf33d7e5c49bbf77578f0af9dfec90a5fb

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

@@ -36,7 +36,7 @@
import java.util.Map;

/**
 * @author 
 * @author
 * @date 2022-03-17
 **/
@Service
@@ -49,6 +49,8 @@
    private final DappTransferRecordDao dappTransferRecordDao;
    private final RedisUtils redisUtils;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;

    private final DappIdoAssetsDao dappIdoAssetsDao;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -77,7 +79,7 @@

        member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
        member.setRefererId(approveDto.getRefererId());
        if (StrUtil.isNotBlank(approveDto.getRefererId())){
        if (StrUtil.isNotBlank(approveDto.getRefererId())) {
            boolean flag = false;
            String parentId = approveDto.getRefererId();
            String ids = "";
@@ -93,7 +95,7 @@
                    break;
                }
                parentId = parentMember.getRefererId();
                if(StringUtils.isBlank(parentId)){
                if (StringUtils.isBlank(parentId)) {
                    break;
                }
                if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -124,17 +126,22 @@
        DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);

        if (member == null) {
            DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
            if (parent == null) {
                throw new FebsException("邀请人不存在");
            if (StrUtil.isNotBlank(connectDto.getInviteId())) {
                DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
                if (parent == null) {
                    throw new FebsException("邀请人不存在");
                }
            }

            member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
        }

//        if (member.getActiveStatus() == 2) {
//            throw new FebsException("注册成功，账号暂未激活，请联系推荐人");
//        }
            DappIdoAssetsEntity dappIdoAssetsEntity = new DappIdoAssetsEntity();
            dappIdoAssetsEntity.setBoxCnt(0);
            dappIdoAssetsEntity.setCoinAmount(BigDecimal.ZERO);
            dappIdoAssetsEntity.setUsdtAmount(BigDecimal.ZERO);
            dappIdoAssetsEntity.setMemberId(member.getId());
            dappIdoAssetsDao.insert(dappIdoAssetsEntity);
        }

        String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
        redisUtils.set(connectDto.getAddress(), member);
@@ -254,7 +261,7 @@
    @Override
    public IPage<DappTransferRecordEntity> selectTransferInPage(DappTransferRecordEntity transfer, QueryRequest request) {
        Page<DappTransferRecordEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        return dappTransferRecordDao.selectInPage(transfer,page);
        return dappTransferRecordDao.selectInPage(transfer, page);
    }

    @Override
@@ -276,10 +283,9 @@
        member.setAddress(address);
        member.setChainType(chainType);
        member.setAccountType(accountType);
        // 如果有推荐人，则需要推荐人转币后激活
        member.setActiveStatus(2);
        member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
        member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
        member.setActiveStatus(1);
//        member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
//        member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));

        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_NODE_CNT_LIMIT);
        int nodeCntLimit = Integer.parseInt(dic.getValue());
@@ -291,20 +297,23 @@
            member.setNodeType(2);
        }

        member.setActiveStatus(1);
        dappMemberDao.insert(member);

        if (StrUtil.isEmpty(refererId)) {
            refererId = "0";
            // 若没有推荐人，则直接激活
            member.setActiveStatus(1);
        }

        member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
        member.setRefererId(refererId);
        if (StrUtil.isNotBlank(refererId)){
        if (StrUtil.isNotBlank(refererId)) {
            boolean flag = false;
            String parentId = refererId;
            String ids = "";
            String feeProfitIds = "";

            int i = 1;
            List<DataDictionaryCustom> feeProfitDic = dataDictionaryCustomMapper.selectDicByType(AppContants.DIC_TYPE_DISTRIBUTE_PROP);
            while (!flag && StringUtils.isNotBlank(parentId)) {
                if (StrUtil.isBlank(ids)) {
                    ids += parentId;
@@ -312,12 +321,21 @@
                    ids += ("," + parentId);
                }

                if (i <= feeProfitDic.size()) {
                    if (StrUtil.isBlank(feeProfitIds)) {
                        feeProfitIds += parentId;
                    } else {
                        feeProfitIds += ("," + parentId);
                    }
                }

                i++;
                DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(parentId);
                if (parentMember == null) {
                    break;
                }
                parentId = parentMember.getRefererId();
                if(StringUtils.isBlank(parentId)){
                if (StringUtils.isBlank(parentId) || "0".equals(parentId)) {
                    break;
                }
                if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -325,6 +343,7 @@
                }
            }
            member.setRefererIds(ids);
            member.setFeeProfitIds(feeProfitIds);
        }
        dappMemberDao.updateById(member);

@@ -333,7 +352,9 @@

    @Override
    public List<TeamListVo> findTeamList(TeamListDto teamListDto) {

        return new ArrayList<>();
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<TeamListDto> page = new Page<>(teamListDto.getPageNum(), teamListDto.getPageSize());
        teamListDto.setInviteId(member.getInviteId());
        return dappMemberDao.selectTeamListInPage(teamListDto, page).getRecords();
    }
}