From 09091079f002ec00f1faefac6d6355e31ab9502c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 八月 2026 17:08:15 +0800
Subject: [PATCH] fix: align franchisee dashboard order statistics
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 8ec4ffc..bc42b6d 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -3615,9 +3615,9 @@
ArrayIndexOutOfBoundsException:17 / "is not being grouped" 规划崩溃；
2) 聚合表达式内禁用 LEAST()，LEAST(ROUND(...)) 会触发 NPE，用嵌套 CASE 等价封顶替代。 -->
- <!-- 按 end_time 日聚合: 关键数据收入/服务费/总充电电量与管理后台 chargingOrderBaseSummary 保持一致 -->
+ <!-- 按 pay_time 日聚合: 关键数据收入/服务费/总充电电量与管理后台 chargingOrderBaseSummary 保持一致 -->
<select id="franchiseeDayStats" resultType="com.ruoyi.order.dto.FranchiseeDayStat">
- SELECT DATE(b.end_time) AS statDay,
+ SELECT DATE(b.pay_time) AS statDay,
COUNT(*) AS orderCount,
SUM(IFNULL(b.order_amount, 0)) AS orderAmount,
SUM(COALESCE(b.order_amount, b.payment_amount)) AS orderAmountEffective,
@@ -3657,8 +3657,8 @@
#{siteId}
</foreach>
</if>
- AND b.end_time >= #{start}
- AND b.end_time < #{end}
+ AND b.pay_time >= #{start}
+ AND b.pay_time < #{end}
GROUP BY 1
</select>
--
Gitblit v1.7.1