功能:恢复商户账号分组查看

This commit is contained in:
yml2213
2026-08-13 13:39:37 +08:00
parent cfdc12cf94
commit 6dae7fafa8
7 changed files with 198 additions and 15 deletions
+34
View File
@@ -266,6 +266,40 @@ func TestPlatformAdminCRUDDoesNotCreateMerchantMembership(t *testing.T) {
}
}
func TestListMerchantAccountGroupsExcludesPlatformAdmins(t *testing.T) {
db := newServiceTestDB(t)
merchantA := model.Merchant{Code: "merchant-accounts-a", Name: "商户账号 A", Status: model.MerchantStatusActive}
merchantB := model.Merchant{Code: "merchant-accounts-b", Name: "商户账号 B", Status: model.MerchantStatusActive}
employeeA := model.User{Username: "merchant-account-a", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
employeeB := model.User{Username: "merchant-account-b", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
admin := model.User{Username: "merchant-account-admin", PasswordHash: "hash", Role: model.RoleAdmin, Status: 1}
for _, entity := range []interface{}{&merchantA, &merchantB, &employeeA, &employeeB, &admin} {
if err := db.Create(entity).Error; err != nil {
t.Fatalf("create fixture: %v", err)
}
}
for _, member := range []model.MerchantMember{
{MerchantID: merchantA.ID, UserID: employeeA.ID, Role: model.MemberRoleOperator, Status: 1},
{MerchantID: merchantA.ID, UserID: employeeB.ID, Role: "support", Status: 1},
{MerchantID: merchantB.ID, UserID: admin.ID, Role: model.MemberRoleOwner, Status: 1},
} {
if err := db.Create(&member).Error; err != nil {
t.Fatalf("create membership: %v", err)
}
}
groups, total, err := NewUserService(db, nil).ListMerchantAccountGroups(1, 20)
if err != nil {
t.Fatalf("list merchant account groups: %v", err)
}
if total != 1 || len(groups) != 1 {
t.Fatalf("expected one merchant group, total=%d groups=%+v", total, groups)
}
if groups[0].MerchantID != merchantA.ID || groups[0].Merchant == nil || len(groups[0].Members) != 2 {
t.Fatalf("unexpected merchant account group: %+v", groups[0])
}
}
func TestEnsureAdminUsesConfiguredCredentialsOnlyForEmptyDatabase(t *testing.T) {
db := newServiceTestDB(t)
tenant := NewTenantService(db)