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

Helius

2020-06-03 59467b7af29e66e8a4cd009e414b7123765bb73c

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

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

@@ -133,7 +133,7 @@
        // 点差

        transactionPageOfWalletCoinVo.setSpread(tradeSetting.getSpread().setScale(4, BigDecimal.ROUND_DOWN));

        // 手续费用率

        transactionPageOfWalletCoinVo.setFeeRatio(tradeSetting.getFeeRatio().setScale(4, BigDecimal.ROUND_DOWN));

        transactionPageOfWalletCoinVo.setFeeRatio(tradeSetting.getCoinFeeRatio().setScale(4, BigDecimal.ROUND_DOWN));

        // 用户可用金额

        transactionPageOfWalletCoinVo.setAvailableBalanceBuy(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

        transactionPageOfWalletCoinVo.setAvailableBalanceSell(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));


 src/main/java/com/xcong/excoin/modules/platform/service/impl/PlatformNoticeServiceImpl.java

@@ -11,7 +11,6 @@
import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.modules.platform.dao.PlatformNoticeDao;

import com.xcong.excoin.modules.platform.entity.PlatformNoticeEntity;

import com.xcong.excoin.modules.platform.entity.PlatformPaymentMethodEntity;

import com.xcong.excoin.modules.platform.service.PlatformNoticeService;



@Service