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

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic.go

@@ -113,16 +113,17 @@ func (l *QueryUserSubscribeNodeListLogic) getServers(userSub *user.Subscribe) (u
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe details error: %v", err.Error())
 	}
 	nodeIds := tool.StringToInt64Slice(subDetails.Nodes)
-	tags := strings.Split(subDetails.NodeTags, ",")
+	tags := normalizeSubscribeNodeTags(subDetails.NodeTags)
 
 	l.Debugf("[Generate Subscribe]nodes: %v, NodeTags: %v", nodeIds, tags)
 
 	enable := true
 
 	_, nodes, err := l.svcCtx.NodeModel.FilterNodeList(l.ctx, &node.FilterNodeParams{
-		Page:    0,
+		Page:    1,
 		Size:    1000,
 		NodeId:  nodeIds,
+		Tag:     tags,
 		Enabled: &enable, // Only get enabled nodes
 	})
 
@@ -213,3 +214,21 @@ func (l *QueryUserSubscribeNodeListLogic) getUserSubscribe(token string) (*user.
 
 	return userSub, nil
 }
+
+func normalizeSubscribeNodeTags(raw string) []string {
+	if raw == "" {
+		return nil
+	}
+
+	parts := strings.Split(raw, ",")
+	cleaned := make([]string, 0, len(parts))
+	for _, tag := range parts {
+		trimmed := strings.TrimSpace(tag)
+		if trimmed == "" {
+			continue
+		}
+		cleaned = append(cleaned, trimmed)
+	}
+
+	return tool.RemoveDuplicateElements(cleaned...)
+}

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic_test.go

@@ -23,3 +23,11 @@ func TestFillUserSubscribeInfoEntitlementFields(t *testing.T) {
 	require.Equal(t, int64(3001), sub.EntitlementOwnerUserId)
 	require.True(t, sub.ReadOnly)
 }
+
+func TestNormalizeSubscribeNodeTags(t *testing.T) {
+	tags := normalizeSubscribeNodeTags("美国, 日本, , 美国,  ,日本")
+	require.Equal(t, []string{"美国", "日本"}, tags)
+
+	empty := normalizeSubscribeNodeTags("")
+	require.Nil(t, empty)
+}