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/DeliveryOrderItemMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index dc1b297..5ef7bb0 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -27,7 +27,7 @@
</select>
<select id="selectDoItemListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
- SELECT oi.id,oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
+ SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order_item oi on oi.id = doi.order_item_id
@@ -44,18 +44,19 @@
<select id="selectSettlementListByTime"
resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
- SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
+ SELECT oi.id orderItemId, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price
, ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
, ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time, o.order_no
, (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
+ , (select s.`status` from t_order_settlement_detail sd, t_order_settlement s
+ where sd.order_item_id = oi.id
+ and sd.settlement_id = s.id and s.type = 'supplier') status
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order o on o.id = q.order_id
join t_order_item oi on oi.id = doi.order_item_id
left join t_order_item_settlement ois on ois.order_item_id = oi.id
- left join t_order_settlement_detail sd on sd.order_item_id = oi.id
- left join t_order_settlement s on sd.settlement_id = s.id
WHERE q.deleted = 0 and doi.deleted = 0
and q.supplier_id = #{supplierId}
<if test="startDate != null">
@@ -64,7 +65,7 @@
<if test="endDate != null">
AND q.create_time <= #{endDate}
</if>
- order by q.create_time desc
+ order by q.create_time desc, oi.flower_name, oi.flower_level
</select>
<select id="getSupplierStatisticsByTime"
--
Gitblit v1.9.3