From 4b1ba7d2753178e44edc970f4a2af37e56c85d3b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 22 九月 2024 16:01:57 +0800
Subject: [PATCH] 质检售后 验证和新增返回字段

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

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 3ace381..8d5e6e0 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -133,6 +133,7 @@
                 and (oi.status = 'reduce' or oi.status = 'abnormal')
             )
             and q.transfer_id is null
+            and q.status in ('COLLECTION', 'SEND')
         </if>
         <if test="condition.billId != null and condition.billId != ''">
             AND q.bill_id = #{condition.billId}
@@ -244,4 +245,31 @@
         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>
+    <select id="getFlowerCompleteNumToday" resultType="java.lang.Integer">
+        select IFNULL(sum(oi.num),0) as complete_num
+        from t_order o
+        left join t_order_item oi
+        on o.id=oi.order_id
+        where o.DELETEd=0 and oi.DELETEd=0
+        and o.status_backend not in ('PENDING','CANCEL','REFUND')
+        and o.create_by=#{userId}
+        AND oi.flower_id=#{flowerId}
+        AND o.complete_time BETWEEN  DATE_SUB(CURDATE(), INTERVAL 1 DAY) + INTERVAL 17 HOUR  AND CURDATE() + INTERVAL 17 HOUR
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3