无订阅 支付后出现两个订阅

internal/model/node/model.go

@@ -202,27 +202,36 @@ func (m *customServerModel) ClearServerAllCache(ctx context.Context) error {
 
 // CountNodesByIdsAndTags 根据节点ID和标签计算启用的节点数量
 func (m *customServerModel) CountNodesByIdsAndTags(ctx context.Context, nodeIds []int64, tags []string) (int64, error) {
+	tags = normalizeNodeTags(tags)
+	if len(nodeIds) == 0 && len(tags) == 0 {
+		return 0, nil
+	}
+
 	var count int64
 	query := m.WithContext(ctx).Model(&Node{}).Where("enabled = ?", true)
-
-	if len(nodeIds) > 0 || len(tags) > 0 {
-		subQuery := m.WithContext(ctx).Model(&Node{}).Where("enabled = ?", true)
-
-		if len(nodeIds) > 0 && len(tags) > 0 {
-			subQuery = subQuery.Where("id IN ? OR ?", nodeIds, InSet("tags", tags))
-		} else if len(nodeIds) > 0 {
-			subQuery = subQuery.Where("id IN ?", nodeIds)
-		} else {
-			subQuery = subQuery.Scopes(InSet("tags", tags))
-		}
-
-		query = subQuery
+	if len(nodeIds) > 0 {
+		query = query.Where("id IN ?", nodeIds)
+	}
+	if len(tags) > 0 {
+		query = query.Scopes(InSet("tags", tags))
 	}
 
 	err := query.Count(&count).Error
 	return count, err
 }
 
+func normalizeNodeTags(tags []string) []string {
+	cleaned := make([]string, 0, len(tags))
+	for _, tag := range tags {
+		trimmed := strings.TrimSpace(tag)
+		if trimmed == "" {
+			continue
+		}
+		cleaned = append(cleaned, trimmed)
+	}
+	return tool.RemoveDuplicateElements(cleaned...)
+}
+
 // InSet 支持多值 OR 查询
 func InSet(field string, values []string) func(db *gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {

internal/model/node/model_test.go

@@ -0,0 +1,12 @@
+package node
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNormalizeNodeTags(t *testing.T) {
+	tags := normalizeNodeTags([]string{"美国", " 日本 ", "", "美国", "  ", "日本"})
+	require.Equal(t, []string{"美国", "日本"}, tags)
+}