modify

Helius

2021-05-21 10673abd11b3ade3be86c1c422453c70de7dfef8

modify

 src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java

@@ -78,4 +78,9 @@
     * 订单类型 B-买 S-卖
     */
    private String orderType;

    /**
     * 对面的用户ID
     */
    private Long oppositeMemberId;
}

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

@@ -95,6 +95,7 @@
        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());
@@ -103,6 +104,7 @@
        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,11 +171,13 @@
        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);

        otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());

 src/main/resources/mapper/otc/OtcOrderDao.xml

@@ -20,7 +20,7 @@
            a.order_type orderType,
            b.name name
        from otc_order a
        inner join member b on a.member_id=b.id
        inner join member b on a.opposite_member_id=b.id
        <where>
            <if test="record!=null">
                <if test="record.status != null and record.status == 1">
@@ -37,6 +37,7 @@
                </if>
            </if>
        </where>
        order by create_time desc
    </select>

    <update id="updateOrderStatusByOrderNo">