Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

Helius

2021-05-28 9e522ca421c6024af4644b0b1a5e32f1c2bbf2a4

Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

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

@@ -74,4 +74,6 @@

    @TableField(exist = false)
    private String payType;
    @TableField(exist = false)
    private Integer isDefualt;
}

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

@@ -113,6 +113,7 @@
        MemberEntity member = memberDao.selectById(mb.getMemberId());
        OtcEntrustOrder query = new OtcEntrustOrder();
        query.setMemberId(mb.getMemberId());
        query.setIsDefualt(1);
        query.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
        query.setStatus(OtcEntrustOrder.LINE_UP);
        List<OtcEntrustOrder> buysEntity = otcEntrustOrderDao.selectEntrustOrderByOrderType(query);

 src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "订单类型 B/购买 S/出售")
    private String orderType;

    @ApiModelProperty(value = "类型 1-支付宝2-微信3-银行卡")
    private String payType;

    public BigDecimal getUnitPrice() {
        return unitPrice.setScale(2, BigDecimal.ROUND_DOWN);
    }

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

@@ -51,6 +51,10 @@
            <if test="record.status != null and record.status != 3">
                and a.status = #{record.status}
            </if>

            <if test="record.isDefualt != null">
                and b.is_defualt = #{record.isDefualt}
            </if>
        </where>
    </select>