fix

internal/domains/product/repositories/product_repository_interface.go

@@ -19,6 +19,7 @@ type ProductRepository interface {
 
 	// 复杂查询方法
 	ListProducts(ctx context.Context, query *queries.ListProductsQuery) ([]*entities.Product, int64, error)
+	ListProductsWithSubscriptionStatus(ctx context.Context, query *queries.ListProductsQuery) ([]*entities.Product, map[string]bool, int64, error)
 
 	// 业务查询方法
 	FindSubscribableProducts(ctx context.Context, userID string) ([]*entities.Product, error)

internal/domains/product/repositories/queries/product_queries.go

@@ -2,17 +2,19 @@ package queries
 
 // ListProductsQuery 产品列表查询
 type ListProductsQuery struct {
-	Page       int     `json:"page"`
-	PageSize   int     `json:"page_size"`
-	Keyword    string  `json:"keyword"`
-	CategoryID string  `json:"category_id"`
-	MinPrice   *float64 `json:"min_price"`
-	MaxPrice   *float64 `json:"max_price"`
-	IsEnabled  *bool   `json:"is_enabled"`
-	IsVisible  *bool   `json:"is_visible"`
-	IsPackage  *bool   `json:"is_package"`
-	SortBy     string  `json:"sort_by"`
-	SortOrder  string  `json:"sort_order"`
+	Page          int      `json:"page"`
+	PageSize      int      `json:"page_size"`
+	Keyword       string   `json:"keyword"`
+	CategoryID    string   `json:"category_id"`
+	MinPrice      *float64 `json:"min_price"`
+	MaxPrice      *float64 `json:"max_price"`
+	IsEnabled     *bool    `json:"is_enabled"`
+	IsVisible     *bool    `json:"is_visible"`
+	IsPackage     *bool    `json:"is_package"`
+	UserID        string   `json:"user_id"`        // 用户ID，用于查询订阅状态
+	IsSubscribed  *bool    `json:"is_subscribed"`  // 是否已订阅筛选
+	SortBy        string   `json:"sort_by"`
+	SortOrder     string   `json:"sort_order"`
 }
 
 // SearchProductsQuery 产品搜索查询

internal/domains/product/services/product_management_service.go

@@ -334,4 +334,55 @@ func (s *ProductManagementService) ListProducts(ctx context.Context, filters map
 	)
 
 	return products, total, nil
+}
+
+// ListProductsWithSubscriptionStatus 获取产品列表（包含订阅状态）
+func (s *ProductManagementService) ListProductsWithSubscriptionStatus(ctx context.Context, filters map[string]interface{}, options interfaces.ListOptions) ([]*entities.Product, map[string]bool, int64, error) {
+	// 构建查询条件
+	query := &queries.ListProductsQuery{
+		Page:     options.Page,
+		PageSize: options.PageSize,
+		SortBy:   options.Sort,
+		SortOrder: options.Order,
+	}
+
+	// 应用筛选条件
+	if keyword, ok := filters["keyword"].(string); ok && keyword != "" {
+		query.Keyword = keyword
+	}
+	if categoryID, ok := filters["category_id"].(string); ok && categoryID != "" {
+		query.CategoryID = categoryID
+	}
+	if isEnabled, ok := filters["is_enabled"].(bool); ok {
+		query.IsEnabled = &isEnabled
+	}
+	if isVisible, ok := filters["is_visible"].(bool); ok {
+		query.IsVisible = &isVisible
+	}
+	if isPackage, ok := filters["is_package"].(bool); ok {
+		query.IsPackage = &isPackage
+	}
+	if userID, ok := filters["user_id"].(string); ok && userID != "" {
+		query.UserID = userID
+	}
+	if isSubscribed, ok := filters["is_subscribed"].(bool); ok {
+		query.IsSubscribed = &isSubscribed
+	}
+
+	// 调用仓储层获取产品列表（包含订阅状态）
+	products, subscriptionStatusMap, total, err := s.productRepo.ListProductsWithSubscriptionStatus(ctx, query)
+	if err != nil {
+		s.logger.Error("获取产品列表失败", zap.Error(err))
+		return nil, nil, 0, fmt.Errorf("获取产品列表失败: %w", err)
+	}
+
+	s.logger.Info("产品列表查询成功",
+		zap.Int("count", len(products)),
+		zap.Int64("total", total),
+		zap.Int("page", options.Page),
+		zap.Int("page_size", options.PageSize),
+		zap.String("user_id", query.UserID),
+	)
+
+	return products, subscriptionStatusMap, total, nil
 }