From c643d549a2d6a801a5fc9d11663599eaa00bb1ed Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期五, 07 八月 2026 18:38:59 +0800
Subject: [PATCH] fix: correct franchisee order amount
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 20fc379..a88db69 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
@@ -10,6 +10,7 @@
import com.ruoyi.order.api.vo.TCharingOrderVO;
import com.ruoyi.order.dto.SixChargingDto;
import com.ruoyi.order.dto.EnterpriseChargingDetailVO;
+import com.ruoyi.order.dto.FranchiseeDayStat;
import com.ruoyi.order.dto.FranchiseeUserAgg;
import com.ruoyi.order.export.EnterpriseChargingDetailExport;
import com.ruoyi.order.service.TChargingOrderService;
@@ -35,6 +36,16 @@
class TChargingOrderControllerTest {
@Test
+ void franchiseeOrderAmountWanUsesActualPaymentInsteadOfOperatingIncome() {
+ FranchiseeDayStat discountedOrder = new FranchiseeDayStat();
+ discountedOrder.setPaymentAmount(new BigDecimal("90"));
+ discountedOrder.setChargingIncome(new BigDecimal("104"));
+
+ assertEquals(new BigDecimal("0.0090"),
+ TChargingOrderController.franchiseeOrderAmountWan(Arrays.asList(discountedOrder)));
+ }
+
+ @Test
void appUserIdsBySiteIdsDelegatesToOrderService() {
TChargingOrderService chargingOrderService = mock(TChargingOrderService.class);
TChargingOrderController controller = new TChargingOrderController();
--
Gitblit v1.7.1