From d83061ad5d5088eb32c71c32d21dd5db278d503a Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 30 七月 2026 11:49:52 +0800
Subject: [PATCH] 各类修复
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TOrderAppealControllerTest.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TOrderAppealControllerTest.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TOrderAppealControllerTest.java
index ed5b857..08b48f4 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TOrderAppealControllerTest.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/controller/TOrderAppealControllerTest.java
@@ -1,7 +1,7 @@
package com.ruoyi.order.controller;
-import com.ruoyi.chargingPile.api.domain.SiteMenu;
-import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
+import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.service.TOrderAppealService;
@@ -11,7 +11,7 @@
import java.util.Arrays;
import java.util.HashSet;
-import java.util.Set;
+import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
@@ -21,21 +21,28 @@
class TOrderAppealControllerTest {
@Test
- void partnerAppealSitesUseOrderAppealPermissionInsteadOfSiteListPermission() {
+ void partnerAppealSitesUseAllSitesAssociatedWithCurrentAccount() {
TOrderAppealService appealService = mock(TOrderAppealService.class);
TokenService tokenService = mock(TokenService.class);
- PartnerClient partnerClient = mock(PartnerClient.class);
+ SiteClient siteClient = mock(SiteClient.class);
TOrderAppealController controller = new TOrderAppealController(appealService, tokenService);
- ReflectionTestUtils.setField(controller, "partnerClient", partnerClient);
+ ReflectionTestUtils.setField(controller, "siteClient", siteClient);
SysUser partnerUser = new SysUser();
+ partnerUser.setUserId(7L);
partnerUser.setObjectId(9);
- when(partnerClient.authSite(9, SiteMenu.ORDER_APPEAL.getValue()))
- .thenReturn(R.ok(new HashSet<>(Arrays.asList(-1, 11, 12))));
+ when(siteClient.getSiteListByUserId(7L))
+ .thenReturn(R.ok(Arrays.asList(site(-1), site(11), null, site(12))));
- Set<Integer> result = controller.getPartnerAppealSiteIds(partnerUser);
+ Map<Integer, GetSiteListDTO> result = controller.getVisibleSiteMap(partnerUser);
- assertEquals(new HashSet<>(Arrays.asList(11, 12)), result);
- verify(partnerClient).authSite(9, SiteMenu.ORDER_APPEAL.getValue());
+ assertEquals(new HashSet<>(Arrays.asList(11, 12)), result.keySet());
+ verify(siteClient).getSiteListByUserId(7L);
+ }
+
+ private GetSiteListDTO site(Integer id) {
+ GetSiteListDTO site = new GetSiteListDTO();
+ site.setId(id);
+ return site;
}
}
--
Gitblit v1.7.1