Helius
2021-05-24 98bb976fff2bde94cdc54e64287e506d333e98fb
modify
4 files modified
10 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListVo.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java 3 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -208,12 +208,14 @@
            return Result.fail("参数错误");
        }
        MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(otcEntrustOrder.getMemberId(), null, "1");
        MemberEntity member = memberDao.selectById(otcEntrustOrder.getMemberId());
        OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
        EntrustOrderDetailVo detail = OtcEntrustOrderMapper.INSTANCE.entityToOrderDetail(otcEntrustOrder);
        detail.setName(member.getName());
        detail.setOrderCnt(mb.getBuyCnt());
        detail.setFinishRatio(mb.getFinishRatio());
        detail.setPayType(defualtMethod.getPaymentType());
        return Result.ok(detail);
    }
}
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListVo.java
@@ -38,6 +38,9 @@
    @ApiModelProperty(value = "完成率")
    private BigDecimal finishRatio;
    @ApiModelProperty(value = "支付方式 1-支付宝 2-微信 3-银行卡")
    private String payType;
    public BigDecimal getUnitPrice() {
        return unitPrice.setScale(2, BigDecimal.ROUND_DOWN);
    }
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
@@ -53,6 +53,9 @@
    @ApiModelProperty(value = "完成率")
    private BigDecimal finishRatio;
    @ApiModelProperty(value = "支付方式")
    private String payType;
    public BigDecimal getUnitPrice() {
        return unitPrice.setScale(2, BigDecimal.ROUND_DOWN);
    }
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -13,9 +13,11 @@
            ,a.limit_max_amount max
            ,b.total_order_cnt orderCnt
            ,b.finish_ratio finishRatio
            ,d.payment_type payType
        from otc_entrust_order a
        left join otc_market_bussiness b on a.member_id=b.member_id
        left join member c on a.member_id=c.id
        left join member_payment_method d on a.member_id=d.member_id and d.is_defualt=1
        <where>
            a.status=1 and a.remain_coin_amount > 0
            <if test="record != null">