From 6a86398832bfd9d19235422d6c4752283e2fa373 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期二, 24 九月 2024 22:56:51 +0800
Subject: [PATCH] 售后验证
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index dc1b297..4a1561e 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,7 +44,7 @@
<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, s.`status`
, 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
@@ -57,6 +57,7 @@
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 s.type = 'supplier'
and q.supplier_id = #{supplierId}
<if test="startDate != null">
AND q.create_time > #{startDate}
--
Gitblit v1.9.3