优化：按商户分组展示员工账号

backend/internal/service/merchant_test.go

@@ -256,6 +256,43 @@ func TestUserServicePromotesMerchantAccountToPlatformAdmin(t *testing.T) {
 	}
 }
 
+func TestListMerchantMembersGroupsEmployeesByMerchant(t *testing.T) {
+	db := newServiceTestDB(t)
+	merchantA := model.Merchant{Code: "grouped-members-a", Name: "分组商户 A", Status: model.MerchantStatusActive}
+	merchantB := model.Merchant{Code: "grouped-members-b", Name: "分组商户 B", Status: model.MerchantStatusActive}
+	employeeA := model.User{Username: "grouped-employee-a", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
+	employeeB := model.User{Username: "grouped-employee-b", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
+	admin := model.User{Username: "grouped-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: model.MemberRoleFinance, 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).ListMerchantMembers(1, 20)
+	if err != nil {
+		t.Fatalf("list grouped members: %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 || groups[0].Merchant.Name != merchantA.Name {
+		t.Fatalf("unexpected merchant group: %+v", groups[0])
+	}
+	if len(groups[0].Members) != 2 {
+		t.Fatalf("expected two employees in the merchant group, got %+v", groups[0].Members)
+	}
+}
+
 func TestEnsureAdminUsesConfiguredCredentialsOnlyForEmptyDatabase(t *testing.T) {
 	db := newServiceTestDB(t)
 	tenant := NewTenantService(db)

backend/internal/service/user.go

@@ -28,6 +28,15 @@ type UserListQuery struct {
 	Status     *int
 }
 
+// MerchantMemberGroup keeps employee assignments grouped by merchant for
+// platform account management. Pagination is intentionally based on merchants
+// so one merchant's employees are never split across pages.
+type MerchantMemberGroup struct {
+	MerchantID uint                   `json:"merchant_id"`
+	Merchant   *model.Merchant        `json:"merchant,omitempty"`
+	Members    []model.MerchantMember `json:"members"`
+}
+
 func (s *UserService) List(q UserListQuery) ([]model.User, int64, error) {
 	if q.Page < 1 {
 		q.Page = 1
@@ -59,21 +68,51 @@ func (s *UserService) List(q UserListQuery) ([]model.User, int64, error) {
 	return list, total, err
 }
 
-// ListMerchantMembers returns employee assignments across merchants for platform operations.
-func (s *UserService) ListMerchantMembers(page, size int) ([]model.MerchantMember, int64, error) {
+// ListMerchantMembers returns employee assignments grouped by merchant for platform operations.
+func (s *UserService) ListMerchantMembers(page, size int) ([]MerchantMemberGroup, int64, error) {
 	page, size = normalizePage(page, size)
 	tx := s.db.Model(&model.MerchantMember{}).
 		Joins("JOIN users ON users.id = merchant_members.user_id AND users.deleted_at IS NULL").
 		Where("users.role = ?", model.RoleMerchant)
 	var total int64
-	if err := tx.Count(&total).Error; err != nil {
+	if err := tx.Distinct("merchant_members.merchant_id").Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
+	var merchantIDs []uint
+	if err := tx.Distinct("merchant_members.merchant_id").
+		Order("merchant_members.merchant_id ASC").
+		Offset((page-1)*size).Limit(size).Pluck("merchant_members.merchant_id", &merchantIDs).Error; err != nil {
+		return nil, 0, err
+	}
+	if len(merchantIDs) == 0 {
+		return []MerchantMemberGroup{}, total, nil
+	}
 	var members []model.MerchantMember
-	err := tx.Preload("Merchant").Preload("User").
+	err := s.db.Model(&model.MerchantMember{}).
+		Joins("JOIN users ON users.id = merchant_members.user_id AND users.deleted_at IS NULL").
+		Where("users.role = ? AND merchant_members.merchant_id IN ?", model.RoleMerchant, merchantIDs).
+		Preload("Merchant").Preload("User").
 		Order("merchant_members.merchant_id ASC, merchant_members.id ASC").
-		Offset((page - 1) * size).Limit(size).Find(&members).Error
-	return members, total, err
+		Find(&members).Error
+	if err != nil {
+		return nil, 0, err
+	}
+
+	groupsByMerchant := make(map[uint]*MerchantMemberGroup, len(merchantIDs))
+	groups := make([]MerchantMemberGroup, 0, len(merchantIDs))
+	for _, merchantID := range merchantIDs {
+		group := MerchantMemberGroup{MerchantID: merchantID, Members: []model.MerchantMember{}}
+		groups = append(groups, group)
+		groupsByMerchant[merchantID] = &groups[len(groups)-1]
+	}
+	for _, member := range members {
+		group := groupsByMerchant[member.MerchantID]
+		if group.Merchant == nil {
+			group.Merchant = member.Merchant
+		}
+		group.Members = append(group.Members, member)
+	}
+	return groups, total, nil
 }
 
 func (s *UserService) Create(username, password, nickname, role string, merchantID uint) (*model.User, error) {