zainali5120
2020-11-29 83e2fd8d61d116ce9bf2034e8d05346910f96260
src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
@@ -38,9 +38,9 @@
    public static String ETH_FEE = "0.0042";
    public static final String TOTAL_ADDRESS = "0x3d83A28B6C2d599d2B6D272c5DBcDC9c976d344F";
    public static final String TOTAL_PRIVATE = "4a1ce332133d8917360c5f3b194f703a0cf5b86c4eea319b1cd01197e68dad27";
    public static final String TOTAL_ADDRESS = "0x0e9f7eEfa4Dd804dDAE2972A7195Ea1fE04d2253";
    public static final String TOTAL_PRIVATE = "2b9cb76dd75dddc8ab4c4614f4c66b53604da49672586a026b253fae873bd017";
    public static final String POOL_ADDRESS  = "0x1A37e4B839E5b691a835ff5fCf7c7A760003155D";
    @Resource
    private MemberCoinChargeDao memberCoinChargeDao;
    @Resource
@@ -55,6 +55,8 @@
    public void pool() throws ExecutionException, InterruptedException {
        String gasPrice = getGasString();
        // 查询不归集的账号
        String not_pool_address = redisUtils.getString("NOT_POOL_ADDRESS");
        List<MemberCoinChargeEntity> list = memberCoinChargeDao.selectAllBySymbolAndTag(CoinTypeEnum.USDT.name(), "ERC20", 1);
        if (CollUtil.isNotEmpty(list)) {
            EthService ethService = new EthService();
@@ -64,6 +66,10 @@
                String address = coinCharge.getAddress();
                Long memberId = coinCharge.getMemberId();
                BigDecimal lastAmount = coinCharge.getLastAmount();
                if(StringUtils.isNotBlank(not_pool_address) && not_pool_address.contains(address)){
                    // 不归集的
                    continue;
                }
                if (lastAmount == null || lastAmount.compareTo(LIMIT) < 0) {
                    continue;
                }
@@ -90,7 +96,7 @@
                            usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
                        }
                        String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr,gasPrice);
                        String hash = ethService.tokenSend(privateKey, address, POOL_ADDRESS, usdtStr,gasPrice);
                        log.info("归集:{}", hash);
//                        if (StrUtil.isNotBlank(hash)) {
//                            // 归集成功更新状态 先保存本次的hash值,待交易成功后再更新
@@ -174,7 +180,7 @@
                usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
            }
            String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr,gasPrice);
            String hash = ethService.tokenSend(privateKey, address, POOL_ADDRESS, usdtStr,gasPrice);
            log.info("冲币归集:{}", hash);
//                        if (StrUtil.isNotBlank(hash)) {
//                            // 归集成功更新状态 先保存本次的hash值,待交易成功后再更新