20221130

xiaoyong931011

2022-11-30 8e444d790b352f906d046ed38b620e1214735953

20221130

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

@@ -430,25 +430,26 @@

    @Override
    public void bnbTransfer(Long id) {
        log.info("{}",id);
        //获取对应的流水记录
        DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
        if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == dappFundFlowEntity.getStatus()){
            return;
        }
        //金额
        BigDecimal amount = dappFundFlowEntity.getAmount();
        Long memberId = dappFundFlowEntity.getMemberId();
        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
        if(ObjectUtil.isEmpty(dappMemberEntity)){
            return;
        }
        //目标地址
        String address = dappMemberEntity.getAddress();
        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
        if(StrUtil.isEmpty(hash)){
            return;
        }
        dappFundFlowEntity.setToHash(hash);
//        //金额
//        BigDecimal amount = dappFundFlowEntity.getAmount();
//        Long memberId = dappFundFlowEntity.getMemberId();
//        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
//        if(ObjectUtil.isEmpty(dappMemberEntity)){
//            return;
//        }
//        //目标地址
//        String address = dappMemberEntity.getAddress();
//        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
//        if(StrUtil.isEmpty(hash)){
//            return;
//        }
//        dappFundFlowEntity.setToHash(hash);
        dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
        dappFundFlowDao.updateById(dappFundFlowEntity);


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

@@ -132,7 +132,8 @@
     */
    @Override
    public Long transfer(TransferDto transferDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
//        DappMemberEntity member = LoginUserUtil.getAppUser();
        DappMemberEntity member = dappMemberDao.selectById(transferDto.getMemberId());

        String upgrade = redisUtils.getString("APP_UPGRADE");
        if ("upgrade".equals(upgrade)) {

 src/main/java/cc/mrbird/febs/job/MatrixResetJob.java

@@ -32,7 +32,7 @@

    @Scheduled(cron = "0 0 0 * * ?")
    public void resetMatrix() {
        log.info("重置");
        systemService.resetMatrix();
//        log.info("重置");
//        systemService.resetMatrix();
    }
}

 src/main/java/cc/mrbird/febs/job/RedisLinkHoldJob.java

@@ -18,6 +18,6 @@

    @Scheduled(cron = "0/1 * * * * ?")
    public void redisLinkHold() {
        redisUtils.set("redis_link_hold", 1);
//        redisUtils.set("redis_link_hold", 1);
    }
}

 src/main/resources/application-dev.yml

@@ -26,13 +26,13 @@
          url: jdbc:mysql://120.27.238.55:3306/db_bnbweb?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    database: 8
    database: 13
    # Redis服务器地址
    host: 120.27.238.55
    # Redis服务器连接端口
    port: 6379
    # Redis 密码
    password: xcong123
    password: d3y6dsdl;f.327
    lettuce:
      pool:
        # 连接池中的最小空闲连接
@@ -61,5 +61,5 @@
  online-transfer: false
  chain-listener: false
  reset-job: false
  quartz-job: true
  quartz-job: false
  debug: true

 src/test/java/cc/mrbird/febs/TreeTest.java

@@ -1,13 +1,18 @@
package cc.mrbird.febs;

import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.mapper.DappAchieveMemberTreeDao;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.tree.MatrixTree;
import cc.mrbird.febs.tree.MemberNode;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

import java.math.BigDecimal;

/**
 * @author wzy
@@ -41,11 +46,46 @@
    private DappSystemService dappSystemService;

    @Autowired
    private DappWalletService dappWalletService;

    @Autowired
    private DappAchieveMemberTreeDao dappAchieveMemberTreeDao;

    /**
     *
     * // 第一次{amount: val, fee: 0, txHash: '', type: 1, buyType: 2}
     *       // 成功{type: 1, txHash: result.transactionHash, id: res.data, flag: 'success', buyType: 2}
     *       // 失败{type: 1, id: res.data, flag: 'fail', buyType: 2}
     */
    @Test
    public void testTransfer(){
        //第一次
        TransferDto transferDto = new TransferDto();
        transferDto.setAmount(new BigDecimal(1.05));
        transferDto.setFee(BigDecimal.ZERO);
        transferDto.setType(1);
        transferDto.setBuyType(2);
        transferDto.setMemberId(106L);
        dappWalletService.transfer(transferDto);
    }
    @Test
    public void testTransfer2(){
        //成功
        TransferDto transferDto = new TransferDto();
        transferDto.setType(1);
        transferDto.setTxHash("ceshi"+ DateUtil.now());
        transferDto.setId(324L);
        transferDto.setFlag("success");
        transferDto.setBuyType(2);
        transferDto.setAmount(new BigDecimal(1.05));
        transferDto.setFee(BigDecimal.ZERO);
        transferDto.setMemberId(106L);
        dappWalletService.transfer(transferDto);
    }

    @Test
    public void resetMatrix() {
        dappSystemService.resetMatrix();
//        dappSystemService.resetMatrix();
//        dappAchieveMemberTreeDao.emptyTable();
    }