From 8c1b6f26fdd8429b9833211ef69165a0e2ff2712 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 20 七月 2026 22:56:39 +0800
Subject: [PATCH] fix: 补齐平台收入最新月份统计
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 4e4614a..41c729d 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
@@ -3,11 +3,17 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.vo.TCharingOrderVO;
+import com.ruoyi.order.dto.SixChargingDto;
import com.ruoyi.order.service.TChargingOrderService;
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -17,6 +23,22 @@
class TChargingOrderControllerTest {
@Test
+ void latestAdjacentMonthDataMovesTheSixMonthWindowForward() {
+ SixChargingDto june = new SixChargingDto();
+ june.setMonth("06");
+ SixChargingDto july = new SixChargingDto();
+ july.setMonth("07");
+
+ LocalDate endMonth = TChargingOrderController.resolveStatisticsEndMonth(
+ LocalDate.of(2026, 6, 30), Arrays.asList(june, july));
+ List<SixChargingDto> months = TChargingOrderController.generateLastSixMonths(endMonth);
+
+ assertEquals(LocalDate.of(2026, 7, 30), endMonth);
+ assertEquals(Arrays.asList("02", "03", "04", "05", "06", "07"),
+ months.stream().map(SixChargingDto::getMonth).collect(java.util.stream.Collectors.toList()));
+ }
+
+ @Test
void blankPhoneDoesNotExpandQueryToAllUserIds() {
TChargingOrderService chargingOrderService = mock(TChargingOrderService.class);
AppUserClient appUserClient = mock(AppUserClient.class);
--
Gitblit v1.7.1