From 046622eabdacb7b49eaaa10fcef8189c64d5f0e0 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 11 八月 2026 17:27:22 +0800
Subject: [PATCH] fix: avoid duplicate whitelist platform income
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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 b2318d9..be55485 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
@@ -2723,7 +2723,8 @@
<select id="chargingOrderShareIncomeByOrderIds" resultType="map">
select
o.id as orderId,
- sum(IFNULL(s.channel_pay_amount, 0) - IFNULL(s.share_amount, 0)) as platformIncome,
+ sum(CASE WHEN s.pay_channel = 'WHITELIST' THEN 0
+ ELSE IFNULL(s.channel_pay_amount, 0) - IFNULL(s.share_amount, 0) END) as platformIncome,
sum(IFNULL(s.share_amount, 0)) as partnerIncome,
CASE WHEN o.is_whitelist = 1 AND o.status = 5 THEN IFNULL(o.whitelist_electric_refund_amount, 0)
+ IFNULL(o.whitelist_service_refund_amount, 0) ELSE 0 END as whitelistRefund
@@ -2766,7 +2767,8 @@
<select id="chargingOrderShareIncomeSummaryByOrderIds" resultType="map">
select
- sum(IFNULL(s.channel_pay_amount, 0) - IFNULL(s.share_amount, 0)) as platformIncomeTotal,
+ sum(CASE WHEN s.pay_channel = 'WHITELIST' THEN 0
+ ELSE IFNULL(s.channel_pay_amount, 0) - IFNULL(s.share_amount, 0) END) as platformIncomeTotal,
sum(IFNULL(s.share_amount, 0)) as partnerIncomeTotal
from `charging_pile_order`.t_charging_order_share_record s
inner join `charging_pile_order`.t_charging_order o on o.id = s.charging_order_id
--
Gitblit v1.7.1