Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

xiaoyong931011

2021-05-11 a51aa2ae35b45f070511e42b53f01daccb455016

 src/test/java/com/xcong/excoin/GuijiTest.java

@@ -83,7 +83,7 @@
                            usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));

                        }



                        String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr);

                        String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr,null);

                        System.out.println("归集："+hash);

                        if (StrUtil.isNotBlank(hash)) {

                            // 归集成功更新状态 先保存本次的hash值，待交易成功后再更新

@@ -91,7 +91,7 @@
                            memberCoinChargeDao.updateById(coinCharge);

                        }

                    } else {

                        String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE);

                        String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE,null);

                        System.out.println("转手续费："+hash);

                    }

                }

@@ -106,7 +106,7 @@
       String toAddress = "0xbc6050a2898511bda406660267e6667448070552";

       EthService ethService = new EthService();

       try {

          String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, toAddress, "0.0032");

          String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, toAddress, "0.0032",null);

            System.out.println("转手续费："+hash);

      } catch (InterruptedException e) {

         // TODO Auto-generated catch block