From 1c9cf8c8237f739f3e62beaa637e48cc8077e934 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Sep 2020 14:47:40 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/resources/mapper/contract/ContractOrderDao.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml
index 33c0a73..473036a 100644
--- a/src/main/resources/mapper/contract/ContractOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractOrderDao.xml
@@ -46,7 +46,7 @@
</if>
</where>
</if>
- order by create_time desc
+ order by create_time desc, id desc
</select>
<select id="selectOrderDetailByIdAndMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
@@ -77,4 +77,17 @@
and 0 > reward_amount
</if>
</select>
+
+ <select id="selectWholeOpenOrderByOrderNo" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
+ select * from contract_order
+ where order_no=#{orderNo}
+ and order_type in (1,2) and order_status=1
+ </select>
+
+ <select id="selectWholeFeeAmountByOrderNo" resultType="java.math.BigDecimal">
+ select sum(opening_fee_amount)
+ from contract_order
+ where order_no=#{orderNo}
+ and order_type in (1,2) and order_status=1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1