v0.1

internal/application/product/subscription_application_service_impl.go

@@ -4,12 +4,15 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/shopspring/decimal"
+
 	"go.uber.org/zap"
 
 	"tyapi-server/internal/application/product/dto/commands"
 	appQueries "tyapi-server/internal/application/product/dto/queries"
 	"tyapi-server/internal/application/product/dto/responses"
 	"tyapi-server/internal/domains/product/entities"
+	repoQueries "tyapi-server/internal/domains/product/repositories/queries"
 	product_service "tyapi-server/internal/domains/product/services"
 )
 
@@ -41,7 +44,7 @@ func (s *SubscriptionApplicationServiceImpl) UpdateSubscriptionPrice(ctx context
 	}
 
 	// 2. 更新订阅价格
-	subscription.Price = cmd.Price
+	subscription.Price = decimal.NewFromFloat(cmd.Price)
 
 	// 3. 保存订阅
 	// 这里需要扩展领域服务来支持更新操作
@@ -70,13 +73,26 @@ func (s *SubscriptionApplicationServiceImpl) GetSubscriptionByID(ctx context.Con
 // ListSubscriptions 获取订阅列表
 // 业务流程：1. 获取订阅列表 2. 构建响应数据
 func (s *SubscriptionApplicationServiceImpl) ListSubscriptions(ctx context.Context, query *appQueries.ListSubscriptionsQuery) (*responses.SubscriptionListResponse, error) {
-	// 这里需要扩展领域服务来支持列表查询
-	// 暂时返回空列表
+	repoQuery := &repoQueries.ListSubscriptionsQuery{
+		Page:     query.Page,
+		PageSize: query.PageSize,
+	}
+	subscriptions, total, err := s.productSubscriptionService.ListSubscriptions(ctx, repoQuery)
+	if err != nil {
+		return nil, err
+	}
+	items := make([]responses.SubscriptionInfoResponse, len(subscriptions))
+	for i := range subscriptions {
+		resp := s.convertToSubscriptionInfoResponse(subscriptions[i])
+		if resp != nil {
+			items[i] = *resp // 解引用指针
+		}
+	}
 	return &responses.SubscriptionListResponse{
-		Total: 0,
+		Total: total,
 		Page:  query.Page,
 		Size:  query.PageSize,
-		Items: []responses.SubscriptionInfoResponse{},
+		Items: items,
 	}, nil
 }
 
@@ -137,7 +153,8 @@ func (s *SubscriptionApplicationServiceImpl) convertToSubscriptionInfoResponse(s
 		ID:        subscription.ID,
 		UserID:    subscription.UserID,
 		ProductID: subscription.ProductID,
-		Price:     subscription.Price,
+		Price:     subscription.Price.InexactFloat64(),
+		Product:   s.convertToProductSimpleResponse(subscription.Product),
 		APIUsed:   subscription.APIUsed,
 		CreatedAt: subscription.CreatedAt,
 		UpdatedAt: subscription.UpdatedAt,
@@ -151,7 +168,8 @@ func (s *SubscriptionApplicationServiceImpl) convertToProductSimpleResponse(prod
 		Name:        product.Name,
 		Code:        product.Code,
 		Description: product.Description,
-		Price:       product.Price,
+		Price:       product.Price.InexactFloat64(),
+		Category:    s.convertToCategorySimpleResponse(product.Category),
 		IsPackage:   product.IsPackage,
 	}
 }