交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/service/impl/BizDistributorServiceImpl.java

@@ -140,7 +140,7 @@ public class BizDistributorServiceImpl implements IBizDistributorService
         DistributorValidation.validateForAssignAccount(row);
         SysUser user = accountAssigner.createAccount(
                 row.getDistributorName(), row.getContactPhone(), row.getId(),
-                DistributorRules.ROLE_ID_DISTRIBUTOR, operator);
+                TradePartnerAccountRules.ROLE_KEY_DISTRIBUTOR, operator);
         row.setAccountAssigned(TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES);
         row.setSysUserId(user.getUserId());
         row.setAssignedLoginName(user.getUserName());

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/service/impl/BizSupplierServiceImpl.java

@@ -141,7 +141,7 @@ public class BizSupplierServiceImpl implements IBizSupplierService
         SupplierValidation.validateForAssignAccount(row);
         SysUser user = accountAssigner.createAccount(
                 row.getSupplierName(), row.getContactPhone(), row.getId(),
-                SupplierRules.ROLE_ID_SUPPLIER, operator);
+                TradePartnerAccountRules.ROLE_KEY_SUPPLIER, operator);
         row.setAccountAssigned(TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES);
         row.setSysUserId(user.getUserId());
         row.setAssignedLoginName(user.getUserName());

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/support/DistributorRules.java

@@ -22,6 +22,9 @@ public final class DistributorRules
     public static final String DEL_FLAG_DELETED = "2";
 
     /** 承销商平台角色（sys_role.role_id） */
+    /**
+     * 历史常量；分配账号请使用 {@link TradePartnerAccountRules#ROLE_KEY_DISTRIBUTOR} 解析角色。
+     */
     public static final long ROLE_ID_DISTRIBUTOR = 104L;
 
     public static final String MSG_DELETE_UNPAID_ORDER = "存在未支付订单，无法删除";

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/support/DistributorValidation.java

@@ -140,7 +140,7 @@ public final class DistributorValidation
         if (db.getAccountAssigned() != null
                 && db.getAccountAssigned() == TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES)
         {
-            throw new ServiceException("该承销商已分配账号，不可重复分配");
+            throw new ServiceException(TradePartnerAccountRules.MSG_ALREADY_ASSIGNED_DISTRIBUTOR);
         }
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/support/SupplierRules.java

@@ -23,7 +23,9 @@ public final class SupplierRules
 
     public static final String DEL_FLAG_DELETED = "2";
 
-    /** 供应商平台角色（sys_role.role_id） */
+    /**
+     * 历史常量；分配账号请使用 {@link TradePartnerAccountRules#ROLE_KEY_SUPPLIER} 解析角色。
+     */
     public static final long ROLE_ID_SUPPLIER = 103L;
 
     public static final String MSG_DELETE_UNSETTLED_SETTLEMENT = "存在未结算的结算单，无法删除";

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/support/SupplierValidation.java

@@ -230,7 +230,7 @@ public final class SupplierValidation
         if (db.getAccountAssigned() != null
                 && db.getAccountAssigned() == TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES)
         {
-            throw new ServiceException("该供应商已分配账号，不可重复分配");
+            throw new ServiceException(TradePartnerAccountRules.MSG_ALREADY_ASSIGNED_SUPPLIER);
         }
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/support/TradePartnerAccountAssigner.java

@@ -2,10 +2,12 @@ package com.ruoyi.web.modules.trading.support;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
@@ -21,7 +23,14 @@ public class TradePartnerAccountAssigner
     @Autowired
     private ISysConfigService configService;
 
-    public SysUser createAccount(String partnerName, String contactPhone, Long partnerId, long roleId, String operator)
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    /**
+     * 登录名：名称汉字拼音首字母 + 主键 id；角色按 {@code roleKey} 解析。
+     */
+    public SysUser createAccount(String partnerName, String contactPhone, Long partnerId, String roleKey,
+            String operator)
     {
         String loginName = TradingPartnerLoginNameGenerator.generate(partnerName, partnerId);
         SysUser probe = new SysUser();
@@ -42,7 +51,7 @@ public class TradePartnerAccountAssigner
         user.setPassword(SecurityUtils.encryptPassword(initPwd));
         user.setStatus("0");
         user.setCreateBy(operator);
-        user.setRoleIds(new Long[] { roleId });
+        user.setRoleIds(new Long[] { resolveRoleId(roleKey) });
         int rows = sysUserService.insertUser(user);
         if (rows <= 0 || user.getUserId() == null)
         {
@@ -61,4 +70,18 @@ public class TradePartnerAccountAssigner
         }
         sysUserService.deleteUserById(sysUserId);
     }
+
+    private long resolveRoleId(String roleKey)
+    {
+        if (StringUtils.isEmpty(roleKey))
+        {
+            throw new ServiceException(String.format(TradePartnerAccountRules.MSG_ROLE_NOT_FOUND, ""));
+        }
+        SysRole role = sysRoleMapper.checkRoleKeyUnique(roleKey.trim());
+        if (role == null || role.getRoleId() == null)
+        {
+            throw new ServiceException(String.format(TradePartnerAccountRules.MSG_ROLE_NOT_FOUND, roleKey));
+        }
+        return role.getRoleId();
+    }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/support/TradePartnerAccountRules.java

@@ -9,6 +9,18 @@ public final class TradePartnerAccountRules
 
     public static final int ACCOUNT_ASSIGNED_YES = 1;
 
+    /** 供应商小程序角色权限字符（sys_role.role_key） */
+    public static final String ROLE_KEY_SUPPLIER = "supplier";
+
+    /** 承销商小程序角色权限字符（sys_role.role_key） */
+    public static final String ROLE_KEY_DISTRIBUTOR = "distributor";
+
+    public static final String MSG_ROLE_NOT_FOUND = "未配置权限字符为「%s」的角色，无法分配账号";
+
+    public static final String MSG_ALREADY_ASSIGNED_SUPPLIER = "该供应商已分配账号，不可重复分配";
+
+    public static final String MSG_ALREADY_ASSIGNED_DISTRIBUTOR = "该承销商已分配账号，不可重复分配";
+
     private TradePartnerAccountRules()
     {
     }

baqing-admin/src/test/java/com/ruoyi/web/modules/trading/service/impl/BizDistributorServiceImplTest.java

@@ -98,7 +98,7 @@ class BizDistributorServiceImplTest
         user.setUserId(200L);
         user.setUserName("zxcxs3");
         when(accountAssigner.createAccount(eq("扎西承销商"), eq(VALID_PHONE), eq(3L),
-                eq(DistributorRules.ROLE_ID_DISTRIBUTOR), eq("admin"))).thenReturn(user);
+                eq(TradePartnerAccountRules.ROLE_KEY_DISTRIBUTOR), eq("admin"))).thenReturn(user);
         when(mapper.updateBizDistributor(any())).thenReturn(1);
         assertEquals(1, service.assignAccount(3L, "admin"));
         verify(mapper).updateBizDistributor(argThat(r ->
@@ -115,7 +115,7 @@ class BizDistributorServiceImplTest
         db.setAccountAssigned(TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES);
         when(mapper.selectBizDistributorById(4L)).thenReturn(db);
         assertThrows(ServiceException.class, () -> service.assignAccount(4L, "admin"));
-        verify(accountAssigner, never()).createAccount(any(), any(), any(), anyLong(), any());
+        verify(accountAssigner, never()).createAccount(any(), any(), any(), any(), any());
     }
 
     @Test

baqing-admin/src/test/java/com/ruoyi/web/modules/trading/service/impl/BizSupplierServiceImplTest.java

@@ -117,7 +117,7 @@ class BizSupplierServiceImplTest
         user.setUserId(100L);
         user.setUserName("zxgys1");
         when(accountAssigner.createAccount(eq("扎西供应商"), eq(VALID_PHONE), eq(1L),
-                eq(SupplierRules.ROLE_ID_SUPPLIER), eq("admin"))).thenReturn(user);
+                eq(TradePartnerAccountRules.ROLE_KEY_SUPPLIER), eq("admin"))).thenReturn(user);
         when(mapper.updateBizSupplier(any())).thenReturn(1);
         assertEquals(1, service.assignAccount(1L, "admin"));
         verify(mapper).updateBizSupplier(argThat(r ->
@@ -135,7 +135,7 @@ class BizSupplierServiceImplTest
         db.setAccountAssigned(TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES);
         when(mapper.selectBizSupplierById(2L)).thenReturn(db);
         assertThrows(ServiceException.class, () -> service.assignAccount(2L, "admin"));
-        verify(accountAssigner, never()).createAccount(any(), any(), any(), org.mockito.ArgumentMatchers.anyLong(), any());
+        verify(accountAssigner, never()).createAccount(any(), any(), any(), any(), any());
     }
 
     @Test

baqing-admin/src/test/java/com/ruoyi/web/modules/trading/support/TradePartnerAccountAssignerTest.java

@@ -0,0 +1,68 @@
+package com.ruoyi.web.modules.trading.support;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("TradePartnerAccountAssigner")
+class TradePartnerAccountAssignerTest
+{
+    @Mock
+    private ISysUserService sysUserService;
+
+    @Mock
+    private ISysConfigService configService;
+
+    @Mock
+    private SysRoleMapper sysRoleMapper;
+
+    @InjectMocks
+    private TradePartnerAccountAssigner assigner;
+
+    @Test
+    @DisplayName("按 role_key 绑定供应商角色")
+    void createAccountSupplierRole()
+    {
+        SysRole role = new SysRole();
+        role.setRoleId(103L);
+        when(sysRoleMapper.checkRoleKeyUnique(TradePartnerAccountRules.ROLE_KEY_SUPPLIER)).thenReturn(role);
+        when(sysUserService.checkUserNameUnique(any())).thenReturn(true);
+        when(configService.selectConfigByKey("sys.user.initPassword")).thenReturn("123456");
+        when(sysUserService.insertUser(any())).thenAnswer(inv -> {
+            SysUser u = inv.getArgument(0);
+            u.setUserId(1L);
+            return 1;
+        });
+
+        SysUser user = assigner.createAccount("扎西供应商", "13800138000", 12L,
+                TradePartnerAccountRules.ROLE_KEY_SUPPLIER, "admin");
+        assertEquals("zxgys12", user.getUserName());
+        verify(sysRoleMapper).checkRoleKeyUnique(TradePartnerAccountRules.ROLE_KEY_SUPPLIER);
+    }
+
+    @Test
+    @DisplayName("角色不存在")
+    void roleMissing()
+    {
+        when(sysUserService.checkUserNameUnique(any())).thenReturn(true);
+        when(sysRoleMapper.checkRoleKeyUnique(TradePartnerAccountRules.ROLE_KEY_SUPPLIER)).thenReturn(null);
+        assertThrows(ServiceException.class, () -> assigner.createAccount("甲", "13800138000", 1L,
+                TradePartnerAccountRules.ROLE_KEY_SUPPLIER, "admin"));
+    }
+}