Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB

2019232

2022-12-13 11e14ba210ed19aaf89cade6d5b51b6c53ca38aa

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

@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.utils.SpringContextUtil;
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.contract.ContractMain;
import cc.mrbird.febs.dapp.dto.SystemDto;
import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.entity.*;
@@ -30,6 +31,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
import java.util.*;

@@ -53,6 +55,7 @@
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final DappSystemProfitDao dappSystemProfitDao;
    private final ChainProducer chainProducer;
    private final ContractMain contractMain;


    @Override
@@ -355,7 +358,7 @@
                DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), memberLevelProfit, 4, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
                dappFundFlowDao.insert(fundFlow);
                //发送转币消息
                chainProducer.sendBnbTransferMsg(fundFlow.getId());
//                chainProducer.sendBnbTransferMsg(fundFlow.getId());
                systemProfitTotal = systemProfitTotal.add(memberLevelProfit);
            }
        }
@@ -365,7 +368,7 @@
            DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
            dappFundFlowDao.insert(fundFlow);
            //发送转币消息
            chainProducer.sendBnbTransferMsg(fundFlow.getId());
//            chainProducer.sendBnbTransferMsg(fundFlow.getId());
        }

        dappSystemProfitDao.updateLevelProfitById(DappSystemProfit.ENUM_YES,dappSystemProfit.getId());
@@ -464,16 +467,19 @@
        }
        Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
//        if(count > 0){
//        //金额
//        BigDecimal amount = dappFundFlowEntity.getAmount();
//        //目标地址
//        String address = dappMemberEntity.getAddress();
//        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
//        if(StrUtil.isEmpty(hash)){
//            return;
//        }
//        dappFundFlowEntity.setToHash(hash);
//        dappFundFlowDao.updateById(dappFundFlowEntity);
//            DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
//            //金额
//            BigDecimal amount = dappFundFlow.getAmount();
//            //目标地址
//            String address = dappFundFlow.getAddress();
//    //        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
//            String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
//            if(StrUtil.isEmpty(hash)){
//                return;
//            }
//            log.info("{},{}",id,hash);
//            dappFundFlow.setFromHash(hash);
//            dappFundFlowDao.updateById(dappFundFlow);
//        }
    }

@@ -484,6 +490,38 @@
        if(ObjectUtil.isEmpty(dappMemberEntity)){
            return;
        }
        //所有上级（不包含直属上级）
        String refererIds = dappMemberEntity.getRefererIds();
        List<String> refererIdList = StrUtil.split(refererIds, ',');
        if(CollUtil.isNotEmpty(refererIdList)){
            for(String inviteIdStr : refererIdList){
                DappMemberEntity dappMemberEntityUp = dappMemberDao.selectMemberInfoByInviteId(inviteIdStr);
                if(ObjectUtil.isEmpty(dappMemberEntityUp)){
                    continue;
                }
                String accountType = dappMemberEntityUp.getAccountType();
                if(DataDictionaryEnum.BIG_BOSS.getCode().equals(accountType)){
                    continue;
                }
                //当前为BOSS，且直推中有两个BOSS以上，则升级BIG_BOSS
                if(DataDictionaryEnum.BOSS.getCode().equals(accountType)){
                    Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),dappMemberEntityUp.getInviteId());
                    if(2 <= bossCount){
                        dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BIG_BOSS.getCode(),dappMemberEntityUp.getId());
                    }
                    continue;
                }
                //当前为AGENT，且直推中有两个以上，则升级BOSS
                if(DataDictionaryEnum.AGENT.getCode().equals(accountType)){
                    Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,dappMemberEntityUp.getInviteId());
                    if(2 <= bossCount){
                        dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BOSS.getCode(),dappMemberEntityUp.getId());
                    }
                    continue;
                }
            }
        }
        //直属上级
        String accountType = dappMemberEntity.getAccountType();
        if(DataDictionaryEnum.BIG_BOSS.getCode().equals(accountType)){
            return;
@@ -506,6 +544,36 @@
        }
    }

    @Override
    public void bnbTransferTest(Long id) {
        DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
        //用户已经加入动能队列
        DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
        if(ObjectUtil.isEmpty(dappSystemProfit)){
            return;
        }
        if(ObjectUtil.isEmpty(dappFundFlow)){
            return;
        }
        //金额
        BigDecimal amount = dappFundFlow.getAmount();
        //目标地址
        Long memberId = dappFundFlow.getMemberId();
        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
        if(ObjectUtil.isEmpty(dappMemberEntity)){
            return;
        }
        String address = dappMemberEntity.getAddress();
        log.info("{}",address);
        String hash = contractMain.trans(new BigInteger(amount.toString()),address);
        if(StrUtil.isEmpty(hash)){
            return;
        }

        dappFundFlow.setFromHash(hash);
        dappFundFlowDao.updateById(dappFundFlow);
    }

    public static void main(String[] args) {
        String refererIds = "1,2,3,4,5," +
                            "6,7,8,9,10," +