From 118623071a97b66f21c29e2bc02b8f15855ede5d Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 25 九月 2024 19:54:11 +0800
Subject: [PATCH] 均价计算 优化
---
src/main/resources/mapper/payment/OrderMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 8d5e6e0..4d7d43a 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -145,6 +145,9 @@
and oi.flower_name LIKE concat('%', #{condition.flowerName},'%')
)
</if>
+ <if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
+ AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
+ </if>
ORDER BY q.create_time desc, q.payment_time desc
</select>
@@ -261,15 +264,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