fix transfer

Helius

2022-06-08 60f9b412d8c49501dc55a4ffd8f4a63a69043cd0

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

@@ -15,6 +15,7 @@
import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
@@ -75,17 +76,24 @@
                return;
            }

            DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
            if (fromMember == null) {
                DappMemberEntity sourceAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
                fromMember = dappMemberService.insertMember(e.from, sourceAddress.getInviteId());
            }
//            DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
//            if (fromMember == null) {
//                DappMemberEntity sourceAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
//                fromMember = dappMemberService.insertMember(e.from, sourceAddress.getInviteId());
//                return;
//            }

            // 如果转账对象地址不为源池地址，则创建用户
            // 如果转账对象地址不为源池地址，且对象地址在系统中存在并未激活，则激活用户
            if (!e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress())) {
                DappMemberEntity toMember = dappMemberDao.selectByAddress(e.to, null);
                if (toMember == null) {
                    toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
//                    toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
                    return;
                }

                if (toMember.getActiveStatus() == 2) {
                    toMember.setActiveStatus(1);
                    dappMemberService.updateById(toMember);
                }
            }

@@ -106,8 +114,7 @@
                // 划点分配
                dappSystemService.tradeProfitDistribute(fundFlow.getId());

                DappOnlineTransferEntity record = new DappOnlineTransferEntity(e.from, transferAmount, fundFlow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), "USDT", fundFlow.getId().toString());
                dappOnlineTransferDao.insert(record);
                OnlineTransferUtil.addTransfer(e.from, transferAmount, fundFlow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundFlow.getId().toString());

                Map<String, String> map = new HashMap<>();
                map.put("batchNo", fundFlow.getId().toString());