Merge branch 'pilot' of https://gitee.com/chonggaoxiao/new_excoin into pilot

Helius

2020-10-15 fba8eb05dcb8b08f894a3924316874b233030e92

Merge branch 'pilot' of https://gitee.com/chonggaoxiao/new_excoin into pilot

 src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java

@@ -34,8 +34,10 @@

    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 = "0x6Ea2f57EeECD248C5aa22df00bb46F9f1C4Ddf2C";
    public static final String TOTAL_PRIVATE = "fe3ddbeaed128b3237b3ce9462c5b30adf6ba9e9874501cf4b3bbad617ad3188";

    public static final String NOTIONAL_POOLING_ADDRESS = "0x1dDEeCEBd885adb73e434e7486CDd25f10EbEe75";

    @Resource
    private MemberCoinChargeDao memberCoinChargeDao;
@@ -80,7 +82,7 @@
                            usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
                        }

                        String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr);
                        String hash = ethService.tokenSend(privateKey, address, NOTIONAL_POOLING_ADDRESS, usdtStr);
                        log.info("归集:{}", hash);
//                        if (StrUtil.isNotBlank(hash)) {
//                            // 归集成功更新状态 先保存本次的hash值，待交易成功后再更新
@@ -121,7 +123,7 @@
                    String privateKey = coinAddress.getPrivateKey();

                    BigDecimal tr = eth.subtract(ETH_TR_FEE);
                    String hash = ethService.ethSend(privateKey, address, TOTAL_ADDRESS, tr.toPlainString());
                    String hash = ethService.ethSend(privateKey, address, NOTIONAL_POOLING_ADDRESS, tr.toPlainString());
                    if (StrUtil.isNotBlank(hash)) {
                        coinCharge.setHash(hash);
                        coinCharge.setLastAmount(new BigDecimal("0.0001"));