Merge branch 'franchisee-user-perf' into 2.2

longz

2026-08-04 e7790134e4210ee69974fc158d13445e9f6277af

 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