modify

Helius

2021-05-24 8a6e55cccdef5989b296b04a2c514341db70195f

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

@@ -101,15 +101,24 @@
        otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
        otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);

        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), 3, "1");
        otcOrder.setBankName(defualtMethod.getBank());
        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), null, "1");
        if (defualtMethod == null) {
            throw new GlobalException("对方未设置默认支付方式");
        }
        if (MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(defualtMethod.getPaymentType())) {
            otcOrder.setBankName(defualtMethod.getBank());
        } else {
            otcOrder.setBankName(defualtMethod.getPaymentQrcode());
        }

        otcOrder.setBankNo(defualtMethod.getAccount());
        otcOrder.setCardName(defualtMethod.getName());
        otcOrder.setPayType(defualtMethod.getPaymentType());

        OtcOrder sale = new OtcOrder();
        BeanUtil.copyProperties(otcOrder, sale);
        sale.setMemberId(entrustOrder.getMemberId());
        otcOrder.setOppositeMemberId(member.getId());
        sale.setOppositeMemberId(member.getId());
        sale.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
        otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
        this.baseMapper.insert(otcOrder);
@@ -185,10 +194,19 @@
        buy.setOppositeMemberId(member.getId());
        buy.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);

        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
        buy.setBankName(defualtMethod.getBank());
        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
        if (defualtMethod == null) {
            throw new GlobalException("未设置默认支付方式");
        }

        if (MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(defualtMethod.getPaymentType())) {
            buy.setBankName(defualtMethod.getBank());
        } else {
            buy.setBankName(defualtMethod.getPaymentQrcode());
        }
        buy.setBankNo(defualtMethod.getAccount());
        buy.setCardName(defualtMethod.getName());
        buy.setPayType(defualtMethod.getPaymentType());

        otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
        this.baseMapper.insert(otcOrder);
@@ -227,7 +245,7 @@
        }

        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());
        }

@@ -288,6 +306,7 @@
        buyDetail.setUnitPrice(buyOrder.getUnitPrice());
        buyDetail.setCreateTime(buyOrder.getCreateTime());
        buyDetail.setIsMb(member.getIsTrader());
        buyDetail.setPayName(buyOrder.getPayName());

        OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
        MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());
@@ -296,7 +315,8 @@

        buyDetail.setBankName(buyOrder.getBankName());
        buyDetail.setBankNo(buyOrder.getBankNo());
        buyDetail.setPayName(buyOrder.getCardName());
        buyDetail.setCardName(buyOrder.getCardName());
        buyDetail.setPayType(buyOrder.getPayType());
        buyDetail.setPayTime(buyOrder.getPayTime());

        if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
@@ -305,7 +325,6 @@
            buyDetail.setFinishRatio(otcMb.getFinishRatio());
            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);
@@ -327,6 +346,8 @@
        if (saleOrder == null) {
            return Result.fail("参数错误");
        }
        MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());


        SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
        saleDetail.setOrderNo(saleOrder.getOrderNo());
@@ -337,6 +358,7 @@
        saleDetail.setCreateTime(saleOrder.getCreateTime());
        saleDetail.setIsMb(member.getIsTrader());
        saleDetail.setPayName(saleOrder.getPayName());
        saleDetail.setSaleName(buyMember.getName());

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