From 9c6e78ea55ef4c865b8148a5ca47322504ed1f50 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期六, 31 八月 2024 20:09:49 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/resources/mapper/payment/OrderMapper.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 2043d0b..6cdbeaf 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -7,6 +7,10 @@
         where status_backend = 'SEND' and partner_id is not null
     </update>
 
+    <select id="getPartnerOrderReceive" resultType="com.mzl.flower.entity.payment.Order">
+        select * from t_order t where status_backend = 'SEND' and partner_id is not null
+    </select>
+
     <select id="getOrderStatusCount" resultType="com.mzl.flower.dto.response.payment.OrderStatusCountDTO">
         SELECT q.status_backend value, count(1) orderCount
         FROM t_order q
@@ -236,4 +240,13 @@
         and o.receive_time &lt; #{endTime}
         and o.bill_id is null
     </select>
+
+    <select id="getUserLastOrder" resultType="com.mzl.flower.entity.payment.Order">
+        select o.*
+        from t_order o
+        where o.receive_time is not null
+        AND o.create_by = #{userId}
+        order by o.receive_time desc
+        limit 1
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3