From a73d8cffcf1c0e131de66ed18685691e24bee505 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 23 九月 2024 14:40:57 +0800
Subject: [PATCH] 1.合伙人-新增合伙人头像
---
src/main/resources/mapper/payment/OrderMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 6639b8c..18894dc 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}
@@ -260,15 +261,15 @@
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 id="getFlowerCompleteNumWithinTimeRange" 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
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
+ and o.create_by=#{userId}
+ AND oi.flower_id=#{flowerId}
+ AND o.payment_time BETWEEN #{startTime} AND #{endTime}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3