From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/payment/OrderMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index e0451eb..5e6e22a 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -366,9 +366,13 @@
<select id="getOrderSaleAmount" resultType="java.math.BigDecimal">
SELECT sum(o.payment_amount)
FROM t_order o
- WHERE o.create_time > #{startTime}
- and o.create_time <= #{endTime}
- and o.payment_time is not null
+ 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