From bd57d989b918b469d07987159b007347e4eb339c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 05 八月 2026 15:33:19 +0800
Subject: [PATCH] Merge branch 'fix/franchisee-income-align' into 2.2
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/service/impl/PlatformRevenueAnalysisTest.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/service/impl/PlatformRevenueAnalysisTest.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/service/impl/PlatformRevenueAnalysisTest.java
index 66f2e05..d6b5355 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/service/impl/PlatformRevenueAnalysisTest.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/service/impl/PlatformRevenueAnalysisTest.java
@@ -27,6 +27,7 @@
private TChargingOrderServiceImpl service;
private TChargingOrderMapper mapper;
private List<Integer> siteIds;
+ private LocalDate sixBefore;
@BeforeEach
void setUp() {
@@ -35,6 +36,7 @@
siteIds = new ArrayList<>();
siteIds.add(122);
siteIds.add(123);
+ sixBefore = LocalDate.of(2026, 1, 1);
ReflectionTestUtils.setField(service, "baseMapper", mapper);
}
@@ -42,27 +44,27 @@
void platformViewAddsSuccessfulPartnerShareAmount() {
Map<String, Object> totals = new HashMap<>();
totals.put("electrovalence", new BigDecimal("100.00"));
- when(mapper.countAll(siteIds, false)).thenReturn(totals);
- when(mapper.sumSuccessfulShareAmount(siteIds)).thenReturn(new BigDecimal("12.34"));
+ when(mapper.countAll(siteIds, false, sixBefore)).thenReturn(totals);
+ when(mapper.sumSuccessfulShareAmount(siteIds, sixBefore)).thenReturn(new BigDecimal("12.34"));
- Map<String, Object> result = service.countAll(siteIds, false);
+ Map<String, Object> result = service.countAll(siteIds, false, sixBefore);
assertSame(totals, result);
assertEquals(new BigDecimal("12.34"), result.get("commission_amount"));
- verify(mapper).sumSuccessfulShareAmount(siteIds);
+ verify(mapper).sumSuccessfulShareAmount(siteIds, sixBefore);
}
@Test
void partnerViewUsesShareRecordTotalsWithoutASecondQuery() {
Map<String, Object> totals = new HashMap<>();
totals.put("commission_amount", new BigDecimal("8.90"));
- when(mapper.countAll(siteIds, true)).thenReturn(totals);
+ when(mapper.countAll(siteIds, true, sixBefore)).thenReturn(totals);
- Map<String, Object> result = service.countAll(siteIds, true);
+ Map<String, Object> result = service.countAll(siteIds, true, sixBefore);
assertSame(totals, result);
assertEquals(new BigDecimal("8.90"), result.get("commission_amount"));
- verify(mapper, never()).sumSuccessfulShareAmount(siteIds);
+ verify(mapper, never()).sumSuccessfulShareAmount(siteIds, sixBefore);
}
@Test
--
Gitblit v1.7.1