From e7790134e4210ee69974fc158d13445e9f6277af Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 04 八月 2026 20:43:02 +0800
Subject: [PATCH] Merge branch 'franchisee-user-perf' into 2.2
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TChargingOrderControllerTest.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 996e0bb..355d2b1 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
@@ -161,9 +161,14 @@
TAppUserTag oldUserTag = new TAppUserTag();
oldUserTag.setAppUserId(101L);
oldUserTag.setUserTagId(1);
- when(appUserTagClient.getUserTag(org.mockito.ArgumentMatchers.argThat(query ->
- query.getAppUserId().equals(101L) && query.getUserTagId().equals(1))))
- .thenReturn(R.ok(oldUserTag));
+ TAppUserTag duplicateOldUserTag = new TAppUserTag();
+ duplicateOldUserTag.setAppUserId(101L);
+ duplicateOldUserTag.setUserTagId(1);
+ TAppUserTag activeUserTag = new TAppUserTag();
+ activeUserTag.setAppUserId(101L);
+ activeUserTag.setUserTagId(2);
+ when(appUserTagClient.listByUserIds(org.mockito.ArgumentMatchers.anyList()))
+ .thenReturn(R.ok(Arrays.asList(oldUserTag, duplicateOldUserTag, activeUserTag)));
TChargingOrder firstOrder = new TChargingOrder();
firstOrder.setAppUserId(101L);
@@ -176,9 +181,12 @@
List<java.util.Map<String, Object>> result = ReflectionTestUtils.invokeMethod(controller,
"franchiseeUserTags", Arrays.asList(firstOrder, repeatOrder, untaggedOrder));
- assertEquals(1, result.size());
+ assertEquals(2, result.size());
assertEquals("老用户", result.get(0).get("name"));
assertEquals(1L, result.get(0).get("value"));
+ assertEquals("活跃用户", result.get(1).get("name"));
+ assertEquals(1L, result.get(1).get("value"));
+ verify(appUserTagClient).listByUserIds(org.mockito.ArgumentMatchers.anyList());
}
@Test
--
Gitblit v1.7.1