modify

Helius

2021-05-24 8a6e55cccdef5989b296b04a2c514341db70195f

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

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

        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), 3, "1");
        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.setBankName(defualtMethod.getBank());
        otcOrder.setBankNo(defualtMethod.getAccount());
        otcOrder.setCardName(defualtMethod.getName());
        otcOrder.setPayType(defualtMethod.getPaymentType());

        OtcOrder sale = new OtcOrder();
        BeanUtil.copyProperties(otcOrder, sale);
@@ -180,22 +185,28 @@
        otcOrder.setStatus(OtcOrder.STATUS_SUBMIT);
        otcOrder.setPayTime(new Date());
        otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
        otcOrder.setOppositeMemberId(member.getId());
        otcOrder.setOppositeMemberId(entrustOrder.getMemberId());
        otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);

        OtcOrder buy = new OtcOrder();
        BeanUtil.copyProperties(otcOrder, buy);
        buy.setMemberId(entrustOrder.getMemberId());
        buy.setOppositeMemberId(entrustOrder.getMemberId());
        buy.setOppositeMemberId(member.getId());
        buy.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);

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

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

@@ -306,6 +316,7 @@
        buyDetail.setBankName(buyOrder.getBankName());
        buyDetail.setBankNo(buyOrder.getBankNo());
        buyDetail.setCardName(buyOrder.getCardName());
        buyDetail.setPayType(buyOrder.getPayType());
        buyDetail.setPayTime(buyOrder.getPayTime());

        if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
@@ -314,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);