From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
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 1518a66..d0441d5 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">
@@ -90,4 +90,11 @@
where order_no=#{orderNo}
and order_type in (1,2) and order_status=1
</select>
+
+ <update id="updateOrderProfitOrLessById">
+ update contract_order
+ set reward_amount=#{rewardAmount},
+ reward_ratio=#{rewardRatio}
+ where id=#{id}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1