conflect

Helius

2021-05-26 f5d87a5a585adcbb148dee6c62ff6e18c4e7334c

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

@@ -76,24 +76,16 @@

        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("可用金额不足");
            }

            memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), addDto.getAmount());
        }

        OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
        if (mb == null) {
            OtcMarketBussiness otcMb = new OtcMarketBussiness();
            otcMb.setMemberId(member.getId());
            otcMb.setAvgCoinTime(0);
            otcMb.setAvgPayTime(0);
            otcMb.setTotalOrderCnt(0);
            otcMb.setBuyCnt(0);
            otcMb.setFinishRatio(BigDecimal.ZERO);
            otcMb.setStatus(OtcMarketBussiness.CHECK_PASS);
            otcMarketBussinessDao.insert(otcMb);
        if (!MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
            throw new GlobalException("不是市商");
        }

        if (member.getIsTrader() == 2) {
@@ -160,10 +152,10 @@
    public IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto) {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        Page<EntrustListVo> page = new Page<>(dto.getPageNum(), dto.getPageSize());
        List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId());
        if (CollUtil.isNotEmpty(blackLists)) {
//        List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId());
//        if (CollUtil.isNotEmpty(blackLists)) {
            dto.setMemberId(member.getId());
        }
//        }
        return this.baseMapper.selectEntrustListInPage(dto, page);
    }