From 9e522ca421c6024af4644b0b1a5e32f1c2bbf2a4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 10:07:27 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml | 4 ++++
src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java | 2 ++
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 1 +
src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java | 3 +++
4 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
index 17fdc96..fb0c390 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
+++ b/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;
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
index ac41c05..063e337 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java
index 18f2ae9..cba9a05 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java
+++ b/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);
}
diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index 092789a..3ab2b71 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/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>
--
Gitblit v1.9.1