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/test/java/com/ruoyi/order/controller/FinancialSettlementControllerTest.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/FinancialSettlementControllerTest.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/FinancialSettlementControllerTest.java
index 223c7c3..2c7240b 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/FinancialSettlementControllerTest.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/FinancialSettlementControllerTest.java
@@ -30,6 +30,8 @@
first.setElectricity(new BigDecimal("8.1234"));
first.setChargingSecond(90L);
first.setSharingAmount(new BigDecimal("0.46"));
+ first.setPlatformIncome(new BigDecimal("1.24"));
+ first.setPartnerIncome(new BigDecimal("0.64"));
first.setBalanceIncome(new BigDecimal("3.00"));
first.setBalanceGiftIncome(new BigDecimal("1.00"));
first.setVipDiscountAmount(new BigDecimal("0.50"));
@@ -40,6 +42,8 @@
second.setPaymentAmount(new BigDecimal("2.00"));
second.setElectricity(new BigDecimal("1.0000"));
second.setChargingSecond(30L);
+ second.setPlatformIncome(new BigDecimal("0.76"));
+ second.setPartnerIncome(new BigDecimal("0.36"));
String summary = FinancialSettlementController.buildChargingPeriodExportSummary(Arrays.asList(first, second));
@@ -49,6 +53,8 @@
assertTrue(summary.contains("充电收入：14.46元"));
assertTrue(summary.contains("充电电量：9.123度"));
assertTrue(summary.contains("充电时长：2分钟"));
+ assertTrue(summary.contains("平台收入：2.00元"));
+ assertTrue(summary.contains("合作商分成：1.00元"));
assertTrue(summary.contains("三方平台分佣：0.46元"));
assertTrue(summary.contains("余额收入：3.00元"));
assertTrue(summary.contains("余额赠送：1.00元"));
--
Gitblit v1.7.1