fix

internal/application/product/product_application_service_impl.go

@@ -18,10 +18,10 @@ import (
 // ProductApplicationServiceImpl 产品应用服务实现
 // 负责业务流程编排、事务管理、数据转换，不直接操作仓库
 type ProductApplicationServiceImpl struct {
-	productManagementService    *product_service.ProductManagementService
-	productSubscriptionService  *product_service.ProductSubscriptionService
-	productApiConfigAppService  ProductApiConfigApplicationService
-	logger                      *zap.Logger
+	productManagementService   *product_service.ProductManagementService
+	productSubscriptionService *product_service.ProductSubscriptionService
+	productApiConfigAppService ProductApiConfigApplicationService
+	logger                     *zap.Logger
 }
 
 // NewProductApplicationService 创建产品应用服务
@@ -32,10 +32,10 @@ func NewProductApplicationService(
 	logger *zap.Logger,
 ) ProductApplicationService {
 	return &ProductApplicationServiceImpl{
-		productManagementService:    productManagementService,
-		productSubscriptionService:  productSubscriptionService,
-		productApiConfigAppService:  productApiConfigAppService,
-		logger:                      logger,
+		productManagementService:   productManagementService,
+		productSubscriptionService: productSubscriptionService,
+		productApiConfigAppService: productApiConfigAppService,
+		logger:                     logger,
 	}
 }
 
@@ -99,6 +99,11 @@ func (s *ProductApplicationServiceImpl) DeleteProduct(ctx context.Context, cmd *
 // ListProducts 获取产品列表
 // 业务流程：1. 获取产品列表 2. 构建响应数据
 func (s *ProductApplicationServiceImpl) ListProducts(ctx context.Context, filters map[string]interface{}, options interfaces.ListOptions) (*responses.ProductListResponse, error) {
+	// 检查是否有用户ID，如果有则使用带订阅状态的方法
+	if userID, ok := filters["user_id"].(string); ok && userID != "" {
+		return s.ListProductsWithSubscriptionStatus(ctx, filters, options)
+	}
+
 	// 调用领域服务获取产品列表
 	products, total, err := s.productManagementService.ListProducts(ctx, filters, options)
 	if err != nil {
@@ -119,6 +124,36 @@ func (s *ProductApplicationServiceImpl) ListProducts(ctx context.Context, filter
 	}, nil
 }
 
+// ListProductsWithSubscriptionStatus 获取产品列表（包含订阅状态）
+// 业务流程：1. 获取产品列表和订阅状态 2. 构建响应数据
+func (s *ProductApplicationServiceImpl) ListProductsWithSubscriptionStatus(ctx context.Context, filters map[string]interface{}, options interfaces.ListOptions) (*responses.ProductListResponse, error) {
+	// 调用领域服务获取产品列表（包含订阅状态）
+	products, subscriptionStatusMap, total, err := s.productManagementService.ListProductsWithSubscriptionStatus(ctx, filters, options)
+	if err != nil {
+		return nil, err
+	}
+
+	// 转换为响应对象
+	items := make([]responses.ProductInfoResponse, len(products))
+	for i := range products {
+		item := s.convertToProductInfoResponse(products[i])
+
+		// 设置订阅状态
+		if isSubscribed, exists := subscriptionStatusMap[products[i].ID]; exists {
+			item.IsSubscribed = &isSubscribed
+		}
+
+		items[i] = *item
+	}
+
+	return &responses.ProductListResponse{
+		Total: total,
+		Page:  options.Page,
+		Size:  options.PageSize,
+		Items: items,
+	}, nil
+}
+
 // GetProductsByIDs 根据ID列表获取产品
 // 业务流程：1. 获取产品列表 2. 构建响应数据
 func (s *ProductApplicationServiceImpl) GetProductsByIDs(ctx context.Context, query *appQueries.GetProductsByIDsQuery) ([]*responses.ProductInfoResponse, error) {
@@ -353,21 +388,20 @@ func (s *ProductApplicationServiceImpl) GetAvailableProducts(ctx context.Context
 // convertToProductInfoResponse 转换为产品信息响应
 func (s *ProductApplicationServiceImpl) convertToProductInfoResponse(product *entities.Product) *responses.ProductInfoResponse {
 	response := &responses.ProductInfoResponse{
-		ID:            product.ID,
-		Name:          product.Name,
-		Code:          product.Code,
-		Description:   product.Description,
-		Content:       product.Content,
-		CategoryID:    product.CategoryID,
-		Price:         product.Price.InexactFloat64(),
-		IsEnabled:     product.IsEnabled,
-		IsVisible:     product.IsVisible,
-		IsPackage:     product.IsPackage,
-		SEOTitle:      product.SEOTitle,
+		ID:             product.ID,
+		Name:           product.Name,
+		Code:           product.Code,
+		Description:    product.Description,
+		Content:        product.Content,
+		CategoryID:     product.CategoryID,
+		Price:          product.Price.InexactFloat64(),
+		IsEnabled:      product.IsEnabled,
+		IsPackage:      product.IsPackage,
+		SEOTitle:       product.SEOTitle,
 		SEODescription: product.SEODescription,
-		SEOKeywords:   product.SEOKeywords,
-		CreatedAt:     product.CreatedAt,
-		UpdatedAt:     product.UpdatedAt,
+		SEOKeywords:    product.SEOKeywords,
+		CreatedAt:      product.CreatedAt,
+		UpdatedAt:      product.UpdatedAt,
 	}
 
 	// 添加分类信息
@@ -423,4 +457,4 @@ func (s *ProductApplicationServiceImpl) UpdateProductApiConfig(ctx context.Conte
 // DeleteProductApiConfig 删除产品API配置
 func (s *ProductApplicationServiceImpl) DeleteProductApiConfig(ctx context.Context, configID string) error {
 	return s.productApiConfigAppService.DeleteProductApiConfig(ctx, configID)
-} 
+}