From a065b98bea77552f4b7037dc8f74f8c25b0bbb3d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 九月 2024 16:06:41 +0800
Subject: [PATCH] add:返回操作时间
---
src/main/resources/mapper/report/OrderReportMapper.xml | 78 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 3f0670e..d4171f4 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,11 +42,41 @@
and o.payment_time <= #{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>
) t
</select>
+
+ <select id="getOrderDetailReport" resultType="com.mzl.flower.dto.response.report.OrderDetailReportResultVO">
+ select
+ o.order_no,
+ o.customer,
+ CONCAT( o.customer_province, ' ', o.customer_city, ' ', o.customer_region, ' ', o.customer_address ) AS address,
+ o.partner_name,
+ o.create_time as orderDate,
+ o.payment_time,
+ o.status_backend as settleStatus,
+ vor.order_num-vor.order_lack_num as real_sale_num,
+ vor.*
+ from t_order o
+ left join v_order_report vor
+ on o.id =vor.order_id
+ where o.deleted=0
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
+ <if test="dto.startDate != null">
+ and o.payment_time > #{dto.startDate}
+ </if>
+ <if test="dto.endDate != null">
+ 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}
+ )
+ </if>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3