From 036efa3349b001fc96d1d95ea08cf6997eaf0db9 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期二, 18 八月 2026 10:22:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.2' into 2.2
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java
index a88db69..d6477f7 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java
@@ -36,13 +36,14 @@
class TChargingOrderControllerTest {
@Test
- void franchiseeOrderAmountWanUsesActualPaymentInsteadOfOperatingIncome() {
+ void franchiseeIncomeWanUsesManagementOrderSummaryIncome() {
FranchiseeDayStat discountedOrder = new FranchiseeDayStat();
discountedOrder.setPaymentAmount(new BigDecimal("90"));
discountedOrder.setChargingIncome(new BigDecimal("104"));
+ FranchiseeDayStat emptyIncomeOrder = new FranchiseeDayStat();
- assertEquals(new BigDecimal("0.0090"),
- TChargingOrderController.franchiseeOrderAmountWan(Arrays.asList(discountedOrder)));
+ assertEquals(new BigDecimal("0.0104"),
+ TChargingOrderController.franchiseeIncomeWan(Arrays.asList(discountedOrder, emptyIncomeOrder)));
}
@Test
--
Gitblit v1.7.1