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

xiaoyong931011

2021-04-13 e3df690a948641fa1f01dad3f2e06aa46f7b9b03

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

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

@@ -26,9 +26,9 @@

    private final static String FULL_NODE_URL = "https://api.trongrid.io";

    public final static String TRX_PRIVATE_KEY = "ea176fff7ba171154aed643321d1f9ba239e128124d8ffa5d075575ef3b58f81";
    public final static String TRX_ADDRESS = "TPSPfAZ8UG9WiXDNX6SbYHNpX46oLV6xAs";
    public final static String POOL_ADDRESS = "TPSPfAZ8UG9WiXDNX6SbYHNpX46oLV6xAs";
    public final static String TRX_PRIVATE_KEY = "a3f6e445fb7e8b835f84431cc6f4ffc991745338d61d9b2ca1575b822563e1f4";
    public final static String TRX_ADDRESS = "TUEZxDjAKw6aCwQJVKX9RGWZUKDyzFkunA";
    public final static String POOL_ADDRESS = "TXeawtLhKDPYKFhET1MnHRMXYVKPo5ThxB";

    public final static String API_KEY="a7b0c96a-cfcd-474d-88c5-75c6277fedbf";


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

@@ -39,9 +39,9 @@

    public static String ETH_FEE = "0.0042";

    public static final String TOTAL_ADDRESS = "0x0e9f7eEfa4Dd804dDAE2972A7195Ea1fE04d2253";
    public static final String TOTAL_PRIVATE = "2b9cb76dd75dddc8ab4c4614f4c66b53604da49672586a026b253fae873bd017";
    public static final String POOL_ADDRESS = "0x1A37e4B839E5b691a835ff5fCf7c7A760003155D";
    public static final String TOTAL_ADDRESS = "0xF36D33809A06441Cd5Fe58463E2Bc3E8316F119a";
    public static final String TOTAL_PRIVATE = "7dbcf9214cd473a053618456a76b220357bc53bb12fc180970ad8d9c6466f836";
    public static final String POOL_ADDRESS = "0x3F132Cea9E25c4B8065190EA7546E75070F3fc6E";
    @Resource
    private MemberCoinChargeDao memberCoinChargeDao;
    @Resource

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

@@ -109,7 +109,7 @@
                        ThreadPoolUtils.sendWholePrice(memberId);

                        // 插入财务记录
                        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
//                        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);

                        ThreadPoolUtils.sendDingTalk(5);
                        MemberEntity member = memberDao.selectById(memberId);
@@ -440,13 +440,13 @@
        memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
        // 添加冲币记录
        String orderNo = insertCoinCharge(address, memberId, amount, CoinTypeEnum.USDT.name(), "TRC20", BigDecimal.ZERO, hash);
        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);
//        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);

        ThreadPoolUtils.sendDingTalk(5);
        MemberEntity member = memberDao.selectById(memberId);
        if (StrUtil.isNotBlank(member.getPhone())) {
            //String amountEos = amount + "XRP";
            ZzSmsSend.sendRechargeMsg(member.getPhone(), new Date(), amount+"USDT-TRC20", orderNo);
            ZzSmsSend.sendRechargeMsg(member.getPhone(), new Date(), amount+"U", orderNo);
        } else {
            SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
        }
@@ -493,11 +493,11 @@
            memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), newBalance, balance, 0);
            String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance, ethUsdtChargeDto.getHash());
            // 插入财务记录
            LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
//            LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
            ThreadPoolUtils.sendDingTalk(5);
            MemberEntity member = memberDao.selectById(memberId);
            if (StrUtil.isNotBlank(member.getPhone())) {
                String amount = newBalance.toPlainString() + "USDT-ERC20";
                String amount = newBalance.toPlainString() + "U";
                ZzSmsSend.sendRechargeMsg(member.getPhone(),new Date(), amount, orderNo);
            } else {
                SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -174,9 +174,9 @@
        memberDao.insert(member);

        MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
        memberSettingEntity.setSpread(BigDecimal.ONE);
        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
        memberSettingEntity.setSpread(BigDecimal.valueOf(0.5));
        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(2));
        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0085));
        memberSettingEntity.setMemberId(member.getId());
        memberSettingDao.insert(memberSettingEntity);


 src/main/java/com/xcong/excoin/utils/mail/ZzSmsSend.java

@@ -33,7 +33,7 @@

    public static boolean sendRechargeMsg(String telphone, Date time, String amount, String orderNo) {
        String content = "【HiBit】尊敬的用户，恭喜您于{}有一笔充值已成功到账，充值数量为{}, 订单号为{}。";
        return send(telphone, StrUtil.format(content, DateUtil.format(time, DatePattern.NORM_DATETIME_MINUTE_PATTERN), amount));
        return send(telphone, StrUtil.format(content, DateUtil.format(time, DatePattern.NORM_DATETIME_MINUTE_PATTERN), amount, orderNo));
    }

    public static boolean sendWithdrawMsg(String telphone, Date time, String amount) {