From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期一, 02 九月 2024 20:18:52 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

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

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 00fe0c3..f46921d 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -240,4 +240,20 @@
         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>
+
+    <select id="getPointGoodsList" resultType="com.mzl.flower.dto.response.payment.OrderPointGoodsListDTO">
+        select gr.*
+        from t_point_goods_record gr
+        join t_order_point_goods opg on opg.goods_record_id = gr.id
+        where opg.order_id = #{orderId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3