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

Helius

2021-05-28 99faf7be593f0595ce435084ee2b90a8d3da3bd4

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

@@ -130,10 +130,10 @@

    @Override
    public Result applyConditions() {
//        MemberEntity member = LoginUserUtils.getAppLoginUser();
//        member = memberDao.selectById(member.getId());
        long memberId = 444L;
        MemberEntity member = memberDao.selectById(memberId);
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        member = memberDao.selectById(member.getId());
//        long memberId = 444L;
//        MemberEntity member = memberDao.selectById(memberId);
        ApplyConditionsVo applyConditionsVo = new ApplyConditionsVo();

        OtcSetting setting = otcSettingDao.selectById(1L);
@@ -160,6 +160,7 @@
        }

        BigDecimal totalAmount = otcOrderDao.selectOrderTotalAmount(member.getId());
        totalAmount = totalAmount == null ? BigDecimal.ZERO : totalAmount;
        if (setting.getTotalAmount().compareTo(totalAmount) > 0) {
            applyConditionsVo.setTotalAmountStatus(2);
        }else{