From 737f2a5843bfafec2ee861f434c2977d1ec21d21 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 15 十月 2024 15:37:31 +0800
Subject: [PATCH] Revert "1.1"
---
src/main/resources/mapper/report/OrderReportMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 93ffbf0..9cd635b 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -229,7 +229,7 @@
IFNULL(sum(order_lack_num),0) as order_lack_num,
IFNULL(sum(order_num)-sum(order_lack_num),0) as real_sale_num
from (
- select t2.payment_date,t2.id,t2.order_no,t2.create_by,t2.partner_id,p.name as partner_name,r2.* from (
+ select t2.payment_date,t2.id,t2.order_no,t2.create_by,ci.partner_id,p.name as partner_name,r2.* from (
SELECT t.*,
CASE
WHEN t.payment_time > DATE(t.payment_time) + INTERVAL 17 HOUR THEN DATE(t.payment_time) + INTERVAL 1 DAY
@@ -242,8 +242,10 @@
)t2
left join ( <include refid="baseSqlWithDate"></include> ) r2
on t2.id = r2.order_id
+ left join t_customer_info ci
+ on t2.create_by=ci.user_id
left join t_partner_info p
- on t2.partner_id=p.id
+ on ci.partner_id=p.id
)t3
where t3.partner_id is not null
<if test="dto.paymentDateStart != null">
--
Gitblit v1.9.3