From d26e7684442a434e5298d8e3e954519faa18420a Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 10 九月 2024 08:29:35 +0800
Subject: [PATCH] 取消订单 优惠券不存在

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

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 6cdbeaf..880740c 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -201,7 +201,7 @@
             </foreach>
         </if>
 
-        ORDER BY q.partner_id, q.warehouse_name, q.warehouse_location_code, q.create_time desc, q.payment_time desc
+        ORDER BY q.partner_id DESC, q.warehouse_id, q.warehouse_location_id, q.create_time desc, q.payment_time desc
     </select>
 
     <select id="getSupplierSaleNum" resultType="com.mzl.flower.dto.response.payment.SupplierNumDTO">
@@ -249,4 +249,11 @@
         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