归集修改

gao

2020-07-28 5393820239be024bd8cc6950ea0e17076d4cc21c

归集修改

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

@@ -263,7 +263,7 @@
        BigInteger nonce = ethGetTransactionCount.getTransactionCount();

        BigInteger value = Convert.toWei(amount, Convert.Unit.ETHER).toBigInteger();

        RawTransaction rawTransaction = RawTransaction.createEtherTransaction(nonce,

                Convert.toWei("40", Convert.Unit.GWEI).toBigInteger(),

                Convert.toWei("70", Convert.Unit.GWEI).toBigInteger(),

                Convert.toWei("60000", Convert.Unit.WEI).toBigInteger(), toAddress, value);

        byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);

        String hexValue = Numeric.toHexString(signedMessage);


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

@@ -29,10 +29,10 @@

    private static final BigDecimal LIMIT = new BigDecimal("50");
    private static final BigDecimal LIMIT_ETH = new BigDecimal("0.2");
    private static final BigDecimal FEE = new BigDecimal("0.0032");
    private static final BigDecimal FEE = new BigDecimal("0.005");
    private static final BigDecimal ETH_TR_FEE = new BigDecimal("0.0032");

    public static String ETH_FEE = "0.0032";
    public static String ETH_FEE = "0.005";

    public static final String TOTAL_ADDRESS = "0x067b4bE5d7B05560AE539Fc8f10597D854ae056D";
    public static final String TOTAL_PRIVATE = "1fb7288c8c88c37d6f79e9617822bffc8d3635bf2d808c5f6afdee9bb326e49c";

 src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java

@@ -128,7 +128,7 @@
                Long memberId = coinAddressEntity.getMemberId();

                BigDecimal balance = EthService.getEthBlance(address);
                if (balance != null && new BigDecimal("0.008").compareTo(balance) < 0) {
                if (balance != null && new BigDecimal("0.01").compareTo(balance) < 0) {
                    MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.ETH.name());

                    if (walletCoin == null) {

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

@@ -27,9 +27,9 @@
public class GuijiTest {

    

    private static final BigDecimal LIMIT = new BigDecimal("50");

    private static final BigDecimal FEE = new BigDecimal("0.0044");

    private static final BigDecimal FEE = new BigDecimal("0.005");



    public static String ETH_FEE = "0.0044";

    public static String ETH_FEE = "0.005";



    public static final String TOTAL_ADDRESS = "0x067b4bE5d7B05560AE539Fc8f10597D854ae056D";

    public static final String TOTAL_PRIVATE = "1fb7288c8c88c37d6f79e9617822bffc8d3635bf2d808c5f6afdee9bb326e49c";

@@ -46,9 +46,9 @@
        //List<MemberCoinChargeEntity> list = memberCoinChargeDao.selectAllBySymbolAndTag(CoinTypeEnum.USDT.name(), "ERC20", 1);

        List<MemberCoinChargeEntity> list = new ArrayList<MemberCoinChargeEntity>();

        MemberCoinChargeEntity coin = new MemberCoinChargeEntity();

        coin.setAddress("0x4b859f7ba68e2757ae935f9e7426da0c73f63a68");

        coin.setMemberId(184L);

        coin.setLastAmount(new BigDecimal(70.83975901));

        coin.setAddress("0xdf24223ab4599a47aa9383c5c9914edd68ae63dc");

        coin.setMemberId(1L);

        coin.setLastAmount(new BigDecimal(51.01000101));

        list.add(coin);

        if (CollUtil.isNotEmpty(list)) {

            EthService ethService = new EthService();

@@ -99,6 +99,24 @@
            }

        }

    }

    /**

     * 向特定账号转手续费

     */

    @Test

    public void pushFee() {

        String toAddress = "";

        EthService ethService = new EthService();

        try {

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

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

        } catch (InterruptedException e) {

            // TODO Auto-generated catch block

            e.printStackTrace();

        } catch (ExecutionException e) {

            // TODO Auto-generated catch block

            e.printStackTrace();

        }

    }