From 4ff0a37e7ac7c24dffb044684f125c05f018436a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 30 十月 2024 13:25:14 +0800
Subject: [PATCH] 1.财务报表-销售额（原订单）调整
---
src/main/resources/mapper/payment/OrderMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 17f9cde..5e6e22a 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -114,11 +114,18 @@
<if test="condition.endDate != null">
AND q.payment_time <= #{condition.endDate}
</if>
+<!-- <if test="condition.createStartDate != null">-->
+<!-- AND q.create_time >= #{condition.createStartDate}-->
+<!-- </if>-->
+<!-- <if test="condition.createEndDate != null">-->
+<!-- AND q.create_time <= #{condition.createEndDate}-->
+<!-- </if>-->
+ <!-- 修改查询日期对应的的创建时间为支付时间 2024-10-12-->
<if test="condition.createStartDate != null">
- AND q.create_time >= #{condition.createStartDate}
+ AND q.payment_time >= #{condition.createStartDate}
</if>
<if test="condition.createEndDate != null">
- AND q.create_time <= #{condition.createEndDate}
+ AND q.payment_time <= #{condition.createEndDate}
</if>
<if test="condition.partnerId != null">
AND q.partner_id = #{condition.partnerId}
@@ -355,4 +362,17 @@
</if>
ORDER BY q.create_time desc, q.payment_time desc
</select>
+
+ <select id="getOrderSaleAmount" resultType="java.math.BigDecimal">
+ SELECT sum(o.payment_amount)
+ FROM t_order o
+ WHERE o.payment_time is not null
+ and o.refund_time is null
+ <if test="startTime != null">
+ and o.create_time > #{startTime}
+ </if>
+ <if test="endTime != null">
+ and o.create_time <= #{endTime}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3