From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/resources/mapper/OrderMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 1ac517d..67687b3 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -46,9 +46,28 @@
update man_order
set settle = #{settle}
,update_time = getdate()
- ,update_by = #{userId}
+ <if test="userId != null">
+ ,update_by = #{userId}
+ </if>
where 1=1
and id = #{orderId}
</update>
+ <select id="selectComplete" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 4
+ and status = 1
+ order by create_time asc
+ </select>
+
+ <select id="selectToBeHistoryOrder" resultMap="BaseResultMap">
+ select *
+ from man_order
+ where 1=1
+ and settle = 4
+ order by create_time asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1