conflect

Helius

2021-05-26 f5d87a5a585adcbb148dee6c62ff6e18c4e7334c

conflect

 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java

@@ -76,7 +76,8 @@

        if (OtcEntrustOrder.ORDER_TYPE_S.equals(addDto.getType())) {
            MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
            if(coinWallet.getAvailableBalance().compareTo(totalAmount) < 0) {
            BigDecimal multiply = addDto.getUnitPrice().multiply(coinWallet.getAvailableBalance());
            if(multiply.compareTo(totalAmount) < 0) {
                throw new GlobalException("可用金额不足");
            }


 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java

@@ -40,6 +40,8 @@
    public void add() {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        member = memberDao.selectById(member.getId());
//        long memberId = 444L;
//        MemberEntity member = memberDao.selectById(memberId);

        if (MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
            throw new GlobalException("已经是市商");

 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java

@@ -76,6 +76,7 @@

        OtcSetting setting = otcSettingDao.selectById(1L);
        String times = redisUtils.getString(AppContants.OTC_ORDER_CANCEL_TIMES + member.getId());
        times = times == null ? "0" :times;
        if (setting.getCancellNum() <= Integer.parseInt(times)) {
            throw new GlobalException("订单取消次数过多, 限制交易24小时");
        }
@@ -155,6 +156,7 @@

        OtcSetting setting = otcSettingDao.selectById(1L);
        String times = redisUtils.getString(AppContants.OTC_ORDER_CANCEL_TIMES + member.getId());
        times = times == null ? "0" :times;
        if (setting.getCancellNum() <= Integer.parseInt(times)) {
            throw new GlobalException("订单取消次数过多, 限制交易24小时");
        }