From 8ff260150ad8f2804b62dd649e93cefb04e349df Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 27 九月 2024 16:25:04 +0800
Subject: [PATCH] 1.财务报表-订单统计-按日

---
 src/main/resources/mapper/report/OrderReportMapper.xml |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 3f0670e..dfe6619 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -4,29 +4,29 @@
 
     <select id="getOrderDateReport" resultType="com.mzl.flower.dto.response.report.OrderReportResultVO">
         select
-            sum(order_total)  as order_total, -- 销售额
-            sum(order_supplier_price_amount)  as order_supplier_price_amount, -- 花农底价
-            sum(order_markup_one_amount)  as order_markup_one_amount, -- 平台区间加价
-            sum(order_markup_two_amount)  as order_markup_two_amount, -- 平台加价
-            sum(order_markup_partner_amount)  as order_markup_partner_amount, -- 合伙人加价
-            sum(order_price_discount_amount)  as order_price_discount_amount, -- 会员折扣
-            sum(order_coupon_amount_total)  as order_coupon_amount_total, -- 优惠券总金额
-            sum(order_check_fee)  as order_check_fee, -- 降级扣款
-            sum(order_lack_fee_supplier)  as order_lack_fee_supplier, -- 缺货扣款
-            sum(order_replace_fee)  as order_replace_fee, -- 补货扣款
-            sum(order_fee_supplier)  as order_fee_supplier, -- 供应商扣款
-            sum(order_fee_partner)  as order_fee_partner, -- 合伙人扣款
-            sum(order_fee_platform)  as order_fee_platform, -- 平台扣款
-            sum(order_fee_platform_pack)  as order_fee_platform_pack, -- 平台打包扣款
-            sum(order_fee_platform_check)  as order_fee_platform_check, -- 平台质检扣款
-            sum(order_fee_platform_transport)  as order_fee_platform_transport, -- 物流扣款
-            sum(order_total_fee)  as order_total_fee, -- 退款总额
-            sum(order_fee_packing_transport)  as order_fee_packing_transport, -- 打包运费
-            sum(order_num) as order_num,-- 数量
-            sum(order_replace_num) as order_replace_num,-- 补货数量
-            sum(order_reduce_num) as order_reduce_num,-- 降级数量
-            sum(order_lack_num) as order_lack_num, -- 缺货数量
-            sum(order_num)-sum(order_lack_num) as real_sale_num -- 销售扎数
+            sum(order_total)  as order_total,
+            sum(order_supplier_price_amount)  as order_supplier_price_amount,
+            sum(order_markup_one_amount)  as order_markup_one_amount,
+            sum(order_markup_two_amount)  as order_markup_two_amount,
+            sum(order_markup_partner_amount)  as order_markup_partner_amount,
+            sum(order_price_discount_amount)  as order_price_discount_amount,
+            sum(order_coupon_amount_total)  as order_coupon_amount_total,
+            sum(order_check_fee)  as order_check_fee,
+            sum(order_lack_fee_supplier)  as order_lack_fee_supplier,
+            sum(order_replace_fee)  as order_replace_fee,
+            sum(order_fee_supplier)  as order_fee_supplier,
+            sum(order_fee_partner)  as order_fee_partner,
+            sum(order_fee_platform)  as order_fee_platform,
+            sum(order_fee_platform_pack)  as order_fee_platform_pack,
+            sum(order_fee_platform_check)  as order_fee_platform_check,
+            sum(order_fee_platform_transport)  as order_fee_platform_transport,
+            sum(order_total_fee)  as order_total_fee,
+            sum(order_fee_packing_transport)  as order_fee_packing_transport,
+            sum(order_num) as order_num,
+            sum(order_replace_num) as order_replace_num,
+            sum(order_reduce_num) as order_reduce_num,
+            sum(order_lack_num) as order_lack_num,
+            sum(order_num)-sum(order_lack_num) as real_sale_num
         from (
                  select
                      o.order_no,o.payment_time,o.status_backend,vor.*
@@ -42,7 +42,7 @@
                     and o.payment_time &lt;= #{dto.endDate}
                 </if>
                 <if test="dto.partnerId != null">
-                    o.create_by in (
+                    and o.create_by in (
                         select user_id from t_customer_info where partner_id=#{dto.partnerId}
                     )
                 </if>

--
Gitblit v1.9.3