From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
index c0e41ee..35022ef 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -279,6 +279,7 @@
and date(d.create_time) <= #{endDate}
and d.customer_id = #{orderDetail.order.customerId}
and om.money is not null
+ and om.money >0
group by d.delivery_id, o.order_id, om.`column`
UNION ALL
@@ -318,7 +319,7 @@
where date(o.create_time) >= #{startDate}
and date(o.create_time) <= #{endDate}
and o.customer_id = #{orderDetail.order.customerId}
- and o.create_order>0
+ and o.order_review>0
group by od.order_id,od.product_id
UNION ALL
@@ -338,7 +339,9 @@
where date(o.create_time) >= #{startDate}
and date(o.create_time) <= #{endDate}
and o.customer_id = #{orderDetail.order.customerId}
+ and o.order_review>0
and om.money is not null
+ and om.money >0
group by o.order_id, om.`column`
</select>
--
Gitblit v1.8.0