modify

Helius

2021-05-21 d30d959c8f249c20b39e66dd0c48341a77751d21

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

@@ -95,14 +95,25 @@
        otcOrder.setCoinAmount(orderAddDto.getUsdtAmount());
        otcOrder.setTotalAmount(orderAddDto.getCnyAmount());
        otcOrder.setMemberId(member.getId());
        otcOrder.setOppositeMemberId(entrustOrder.getMemberId());
        otcOrder.setStatus(OtcOrder.STATUS_SUBMIT);
        otcOrder.setPayTime(new Date());
        otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
        otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);

        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), 3, "1");
        if (defualtMethod == null) {
            throw new GlobalException("对方未设置默认支付方式");
        }

        otcOrder.setBankName(defualtMethod.getBank());
        otcOrder.setBankNo(defualtMethod.getAccount());
        otcOrder.setCardName(defualtMethod.getName());

        OtcOrder sale = new OtcOrder();
        BeanUtil.copyProperties(otcOrder, sale);
        sale.setMemberId(entrustOrder.getMemberId());
        otcOrder.setOppositeMemberId(member.getId());
        sale.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
        otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
        this.baseMapper.insert(otcOrder);
@@ -169,12 +180,22 @@
        otcOrder.setStatus(OtcOrder.STATUS_SUBMIT);
        otcOrder.setPayTime(new Date());
        otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
        otcOrder.setOppositeMemberId(entrustOrder.getMemberId());
        otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);

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

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

        otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
        this.baseMapper.insert(otcOrder);
@@ -279,11 +300,11 @@
        MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());

        buyDetail.setSaleName(saleMember.getName());
        MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(saleOrder.getMemberId(), 3, "1");
        buyDetail.setBankName(defaultMethod.getName());
        buyDetail.setBankNo(defaultMethod.getAccount());
        buyDetail.setPayName(defaultMethod.getName());
        buyDetail.setPayTime(buyDetail.getPayTime());

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

        if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
            OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(buyOrder.getEntrustMemberId());
@@ -313,6 +334,8 @@
        if (saleOrder == null) {
            return Result.fail("参数错误");
        }
        MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());


        SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
        saleDetail.setOrderNo(saleOrder.getOrderNo());
@@ -323,6 +346,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());