fix: 统一独立合作商角色名称

longz

2026-07-21 4f90d483b0ac3451294fa25413612196fb0fe1d3

fix: 统一独立合作商角色名称

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java

@@ -270,25 +270,28 @@
    }

    Integer resolveDefaultRoleId(Integer partnerType) {
        String roleName = partnerTypeRoleName(partnerType);
        Integer roleId = this.baseMapper.getDefaultPartnerRoleId(roleName);
        if (roleId == null && !Integer.valueOf(1).equals(partnerType)) {
            roleId = this.baseMapper.getDefaultPartnerRoleId("合作商");
        List<String> roleNames = partnerTypeRoleNames(partnerType);
        Integer roleId = null;
        for (String roleName : roleNames) {
            roleId = this.baseMapper.getDefaultPartnerRoleId(roleName);
            if (roleId != null) {
                break;
            }
        }
        if (roleId == null) {
            throw new RuntimeException("系统内置角色【" + roleName + "】不存在，请先配置角色");
            throw new RuntimeException("系统内置角色【" + roleNames.get(0) + "】不存在，请先配置角色");
        }
        return roleId;
    }

    private String partnerTypeRoleName(Integer partnerType) {
    private List<String> partnerTypeRoleNames(Integer partnerType) {
        if (Integer.valueOf(2).equals(partnerType)) {
            return "场地方";
            return Arrays.asList("场地方", "合作商");
        }
        if (Integer.valueOf(3).equals(partnerType)) {
            return "服务商";
            return Arrays.asList("服务商", "合作商");
        }
        return "合作商";
        return Arrays.asList("独立合作商", "合作商");
    }
    /**
     * 删除合作商

 ruoyi-service/ruoyi-chargingPile/src/test/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImplTest.java

@@ -60,6 +60,18 @@
    }

    @Test
    void independentPartnerUsesUnifiedRoleNameBeforeLegacyAlias() {
        PartnerServiceImpl service = new PartnerServiceImpl();
        PartnerMapper mapper = mock(PartnerMapper.class);
        ReflectionTestUtils.setField(service, "baseMapper", mapper);
        when(mapper.getDefaultPartnerRoleId("独立合作商")).thenReturn(11);

        assertEquals(11, service.resolveDefaultRoleId(1));
        verify(mapper).getDefaultPartnerRoleId("独立合作商");
        verify(mapper, never()).getDefaultPartnerRoleId("合作商");
    }

    @Test
    void clearingShareRatiosStillProducesExplicitDatabaseUpdate() {
        PartnerServiceImpl service = new PartnerServiceImpl();
        PartnerMapper mapper = mock(PartnerMapper.class);