modify

Helius

2021-05-25 751acf32f348ae67bf400f74f4601482105d44ee

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

@@ -244,9 +244,8 @@
            throw new GlobalException("不是购买单");
        }

        log.info("======={}", hasPayDto.getName());
        if (StrUtil.isBlank(hasPayDto.getName())) {
            MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
            MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
            hasPayDto.setName(defualtMethod.getName());
        }

@@ -327,7 +326,6 @@
            buyDetail.setOrderCnt(otcMb.getBuyCnt());
        }


        if (OtcOrder.STATUS_SUBMIT.equals(buyOrder.getStatus())) {
            long between = DateUtil.between(new Date(), DateUtil.offsetMinute(buyOrder.getCreateTime(), 30), DateUnit.SECOND, false);
            buyDetail.setTimes(between);
@@ -361,6 +359,7 @@
        saleDetail.setIsMb(member.getIsTrader());
        saleDetail.setPayName(saleOrder.getPayName());
        saleDetail.setSaleName(buyMember.getName());
        saleDetail.setPayType(saleOrder.getPayType());

        if (!saleOrder.getMemberId().equals(saleOrder.getEntrustMemberId())) {
            OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(saleOrder.getEntrustMemberId());