From eaf8eea4c2b6b10765356127053019a1ceb0bbf9 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 05 八月 2026 18:02:33 +0800
Subject: [PATCH] fix: include whitelist refunds in franchisee income
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 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 798e94b..9fbf656 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
@@ -3637,6 +3637,10 @@
SUM(IFNULL(electrovalence, 0) + CASE
WHEN order_source = 1 THEN IFNULL(service_charge, 0)
ELSE IFNULL(service_charge, 0) * 0.8
+ END + CASE
+ WHEN is_whitelist = 1 THEN IFNULL(whitelist_electric_refund_amount, 0)
+ + IFNULL(whitelist_service_refund_amount, 0)
+ ELSE 0
END) AS chargingIncome,
SUM(IFNULL(charging_capacity, 0)) AS capacity,
SUM(IFNULL(charging_power, power)) AS totalPower,
--
Gitblit v1.7.1