From 9e92be78ff75234405481bdff2fb2973ac624edd Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 1 Aug 2025 15:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=BD=E6=8D=A2=E6=88=90pay=5Fat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/StatisticsMapper.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index fe823a0..9684caf 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -65,10 +65,10 @@
         from `order`
         where scenic_id = #{scenicId}
         <if test="startTime!= null">
-            and create_at >= #{startTime}
+            and pay_at >= #{startTime}
         </if>
         <if test="endTime!= null">
-            and create_at &lt;= #{endTime}
+            and pay_at &lt;= #{endTime}
         </if>
         group by member_id
         )a
@@ -251,24 +251,24 @@
         select count(1) as count
         from `order`
         where
-        pay_at is not null  and scenic_id = #{scenicId}
+        (status = 1 or status = 2) and scenic_id = #{scenicId}
         <if test="startTime!= null">
-            and create_at >= #{startTime}
+            and pay_at >= #{startTime}
         </if>
         <if test="endTime!= null">
-            and create_at &lt;= #{endTime}
+            and pay_at &lt;= #{endTime}
         </if>
     </select>
     <select id="countRefundOfOrder" resultType="java.lang.Integer">
         select count(1) as count
         from `order`
         where
-        refund_status = 1  and scenic_id = #{scenicId}
+        refund_status = 1 and scenic_id = #{scenicId}
         <if test="startTime!= null">
-            and create_at >= #{startTime}
+            and refund_at >= #{startTime}
         </if>
         <if test="endTime!= null">
-            and create_at &lt;= #{endTime}
+            and refund_at &lt;= #{endTime}
         </if>
     </select>
     <select id="countRefundAmount" resultType="java.math.BigDecimal">