Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-12 335ec6398bb70d60a765b4782376e8141cbfa9cf

Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv

# Conflicts:
#	src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java
#	src/main/java/com/xcong/excoin/quartz/job/KLineGeneratorJob.java
#	src/main/java/com/xcong/excoin/quartz/job/NotionalPoolingJob.java
#	src/main/resources/application-prod.yml
#	src/main/resources/mapper/member/MemberAuthenticationDao.xml

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

@@ -526,7 +526,7 @@
            ThreadPoolUtils.sendDingTalk(5);
            MemberEntity member = memberDao.selectById(memberId);
            if (StrUtil.isNotBlank(member.getPhone())) {
                String amount = balance.toPlainString() + "ROC";
                String amount = balance.toPlainString() + "CPV";
                Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
            } else {
                SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);