From 27021fdc85fee6e7539c25d7b498537cc4736b72 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 29 七月 2026 20:59:46 +0800
Subject: [PATCH] 各类修复
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index ae3584b..1aaec69 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -361,6 +361,8 @@
BigDecimal paymentAmount = BigDecimal.ZERO;
BigDecimal chargingCapacity = BigDecimal.ZERO;
BigDecimal tripartiteCommission = BigDecimal.ZERO;
+ BigDecimal platformIncome = BigDecimal.ZERO;
+ BigDecimal partnerIncome = BigDecimal.ZERO;
BigDecimal balanceIncome = BigDecimal.ZERO;
BigDecimal balanceGiftIncome = BigDecimal.ZERO;
BigDecimal vipGiftAmount = BigDecimal.ZERO;
@@ -375,6 +377,8 @@
paymentAmount = paymentAmount.add(zero(item.getPaymentAmount()));
chargingCapacity = chargingCapacity.add(zero(item.getElectricity()));
tripartiteCommission = tripartiteCommission.add(zero(item.getSharingAmount()));
+ platformIncome = platformIncome.add(zero(item.getPlatformIncome()));
+ partnerIncome = partnerIncome.add(zero(item.getPartnerIncome()));
balanceIncome = balanceIncome.add(zero(item.getBalanceIncome()));
balanceGiftIncome = balanceGiftIncome.add(zero(item.getBalanceGiftIncome()));
vipGiftAmount = vipGiftAmount.add(zero(item.getVipDiscountAmount()));
@@ -388,7 +392,8 @@
+ " 充电收入：" + money(paymentAmount) + "元"
+ " 充电电量：" + quantity(chargingCapacity) + "度"
+ " 充电时长：" + formatChargingDurationMinutes(chargingSeconds) + "分钟"
- + " 平台手续费：0.00元"
+ + " 平台收入：" + money(platformIncome) + "元"
+ + " 合作商分成：" + money(partnerIncome) + "元"
+ " 三方平台分佣：" + money(tripartiteCommission) + "元"
+ " 余额收入：" + money(balanceIncome) + "元"
+ " 余额赠送：" + money(balanceGiftIncome) + "元"
--
Gitblit v1.7.1