From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 11 ++++++++++-
1 files changed, 10 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..f94fa7d 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -149,6 +149,12 @@
order by id desc
</select>
+ <select id="countByCustomerName">
+ SELECT COUNT(*)
+ FROM sd.customer
+ WHERE customer_name=#{customer.customerName}
+ </select>
+
<select id="getSelectCustomer">
select
*
@@ -279,6 +285,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 +325,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 +345,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