From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/resources/mapper/OrderMapper.xml | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 0e7e9a8..b23e08a 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -60,7 +60,24 @@
from man_order
where 1=1
and settle = 4
- and status = 1
+-- and settle = 97
+ and status = 1
+ order by create_time asc
+ </select>
+ <select id="selectComplete10" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 10
+ and status = 1
+ order by create_time asc
+ </select>
+ <select id="selectComplete9" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 9
+ and status = 1
order by create_time asc
</select>
@@ -70,6 +87,15 @@
where 1=1
and settle = 1
and status = 1
+ order by create_time asc
+ </select>
+
+ <select id="selectComplete99" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 99
+ and status = 1
order by create_time asc
</select>
@@ -109,5 +135,18 @@
and move_status = 1
order by update_time
</select>
+
+ <select id="AllStatusSatisfyOrder" resultType="String">
+ select order_no
+ from man_order
+ where move_status = #{moveStatus}
+ </select>
+
+ <update id="updateOrderStatus">
+ update man_order
+ set move_status = 1
+ where 1=1
+ and order_no = #{orderNo}
+ </update>
</mapper>
--
Gitblit v1.9.1