From df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 16:23:41 +0800
Subject: [PATCH] Merge branch 'master' into whole
---
src/main/resources/mapper/contract/ContractOrderDao.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml
index 6cc08c7..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">
@@ -83,4 +83,11 @@
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