From 553573e945022c22d20630b6078ca9889869f568 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 14 十月 2024 11:42:32 +0800
Subject: [PATCH] fix:花农结算统计调整
---
src/main/resources/mapper/report/OrderReportMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index e456882..9cd635b 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -479,7 +479,7 @@
IFNULL( ois.check_fee, 0 ) AS check_fee,
IFNULL( ois.replace_fee, 0 ) AS replace_fee,
IFNULL( ois.lack_fee_supplier, 0 ) AS lack_fee_supplier,
- IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack'),0) as lack_num
+ IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status='AGREED'),0) as lack_num
FROM
t_order o
LEFT JOIN t_order_item oi ON oi.order_id = o.id
@@ -489,6 +489,7 @@
WHERE
oi.deleted = 0
and o.payment_time is not null
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
<if test="dto.startDate != null">
and o.payment_time >= #{dto.startDate}
</if>
@@ -527,7 +528,7 @@
on vor.supplier_id=p.id
left join t_order o
on vor.order_id= o.id
- and o.status_backend not in ('PENDING','CANCEL','REFUND')
+-- and o.status_backend not in ('PENDING','CANCEL','REFUND')
) s group by dateinfo,supplier_id
</select>
@@ -554,7 +555,7 @@
on vor.supplier_id=p.id
left join t_order o
on vor.order_id= o.id
- and o.status_backend not in ('PENDING','CANCEL','REFUND')
+-- and o.status_backend not in ('PENDING','CANCEL','REFUND')
) s group by dateinfo,supplier_id
</select>
@@ -588,7 +589,7 @@
on vor.supplier_id=p.id
left join t_order o
on vor.order_id= o.id
- and o.status_backend not in ('PENDING','CANCEL','REFUND')
+-- and o.status_backend not in ('PENDING','CANCEL','REFUND')
) s group by dateinfo,supplier_id
) s2
</select>
--
Gitblit v1.9.3