From c6e9715b6e593738abf1a35e49c1bbac0966f3a4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 26 十二月 2024 16:23:34 +0800
Subject: [PATCH] 1.微信登录：未注册的用户自动注册
---
src/main/resources/mapper/report/OrderReportMapper.xml | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index b9b2d5c..f88e5bb 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -47,9 +47,7 @@
and o.payment_time < #{dto.endDate}
</if>
<if test="dto.partnerId != null">
- and o.create_by in (
- select user_id from t_customer_info where partner_id=#{dto.partnerId}
- )
+ and o.partner_id=#{dto.partnerId}
</if>
) t
@@ -96,9 +94,7 @@
and o.payment_time < #{dto.endDate}
</if>
<if test="dto.partnerId != null">
- and o.create_by in (
- select user_id from t_customer_info where partner_id=#{dto.partnerId}
- )
+ and o.partner_id=#{dto.partnerId}
</if>
) t
@@ -130,9 +126,7 @@
and o.payment_time < #{dto.endDate}
</if>
<if test="dto.partnerId != null">
- and o.create_by in (
- select user_id from t_customer_info where partner_id=#{dto.partnerId}
- )
+ and o.partner_id=#{dto.partnerId}
</if>
</select>
@@ -159,9 +153,7 @@
and o.payment_time < #{dto.endDate}
</if>
<if test="dto.partnerId != null">
- and o.create_by in (
- select user_id from t_customer_info where partner_id=#{dto.partnerId}
- )
+ and o.partner_id=#{dto.partnerId}
</if>
</select>
@@ -267,6 +259,7 @@
<sql id="baseSql">
select t2.*,
IFNULL(t2.order_check_fee+t2.order_lack_fee_supplier+t2.order_replace_fee,0) as order_check_total_fee,
+ IFNULL(t2.order_price_discount_amount+t2.order_coupon_amount_total,0) as order_discount_total_fee,
IFNULL(t3.fee_supplier,0) as order_fee_supplier,
IFNULL(t3.fee_partner,0) as order_fee_partner,
IFNULL(t3.fee_platform,0) as order_fee_platform,
@@ -480,7 +473,9 @@
sum( t1.replace_fee ) AS order_replace_fee,
sum( t1.lack_fee_supplier ) AS order_lack_fee_supplier,
sum( t1.num ) AS order_num,
- sum( t1.lack_num ) AS order_lack_num
+ sum( t1.lack_num ) AS order_lack_num,
+ sum( t1.reduce_num ) AS order_reduce_num,
+ sum( t1.replace_num ) AS order_replace_num
FROM
(
SELECT
@@ -496,8 +491,11 @@
IFNULL( oi.supplier_price, 0 ) * IFNULL( oi.num, 0 ) AS supplier_price_amount,
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' and oic.audit_status='AGREED'),0) as lack_num
+ 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 = 'replace' and oic.audit_status='AGREED'),0) as replace_num
+ ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce' and oic.audit_status='AGREED'),0) as reduce_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
@@ -531,7 +529,11 @@
sum(order_supplier_price_amount) order_supplier_price_amount,
sum(order_check_fee) order_check_fee,
sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
+ sum(order_num) as order_num,
sum(order_num)-sum(order_lack_num) as real_sale_num,
+ sum(order_lack_num) as order_lack_num,
+ sum(order_reduce_num ) AS order_reduce_num,
+ sum(order_replace_num ) AS order_replace_num,
sum(sales_fee_supplier) sales_fee_supplier,
sum(order_supplier_price_amount) - sum(order_check_fee) - sum(order_replace_fee) - sum(order_lack_fee_supplier) - sum(sales_fee_supplier) profitFeeAmount,
case when COUNT(CASE WHEN status_backend ='COMPLETED' THEN NULL ELSE 1 END) = 0 Then '已完成' Else '进行中' end as settleStatus
@@ -558,7 +560,11 @@
sum(order_supplier_price_amount) order_supplier_price_amount,
sum(order_check_fee) order_check_fee,
sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
+ sum(order_num) as order_num,
sum(order_num)-sum(order_lack_num) as real_sale_num,
+ sum(order_lack_num) as order_lack_num,
+ sum(order_reduce_num ) AS order_reduce_num,
+ sum(order_replace_num ) AS order_replace_num,
sum(sales_fee_supplier) sales_fee_supplier,
sum(order_supplier_price_amount) - sum(order_check_fee) - sum(order_replace_fee) - sum(order_lack_fee_supplier) - sum(sales_fee_supplier) profitFeeAmount,
case when COUNT(CASE WHEN status_backend ='COMPLETED' THEN NULL ELSE 1 END) = 0 Then '已完成' Else '进行中' end as settleStatus
--
Gitblit v1.9.3