From 98bb976fff2bde94cdc54e64287e506d333e98fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 12:04:57 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml | 2 ++
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 2 ++
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListVo.java | 3 +++
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java | 3 +++
4 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index 35e9229..602b11a 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/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);
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListVo.java
index c2f5bce..153079a 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListVo.java
+++ b/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);
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
index 8b6f64d..f0db3f5 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
+++ b/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);
}
diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index 9b8f5e0..da41c89 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/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">
--
Gitblit v1.9.1