v1.0.0

2025-08-02 02:54:21 +08:00
parent 934dce2776
commit 66845d3fe0
74 changed files with 8686 additions and 212 deletions
--- a/internal/application/product/subscription_application_service_impl.go
+++ b/internal/application/product/subscription_application_service_impl.go
@@ -2,9 +2,6 @@ package product

 import (
 	"context"
-	"fmt"
-
-	"github.com/shopspring/decimal"

 	"go.uber.org/zap"

@@ -14,22 +11,26 @@ import (
 	"tyapi-server/internal/domains/product/entities"
 	repoQueries "tyapi-server/internal/domains/product/repositories/queries"
 	product_service "tyapi-server/internal/domains/product/services"
+	user_repositories "tyapi-server/internal/domains/user/repositories"
 )

 // SubscriptionApplicationServiceImpl 订阅应用服务实现
 // 负责业务流程编排、事务管理、数据转换，不直接操作仓库
 type SubscriptionApplicationServiceImpl struct {
 	productSubscriptionService *product_service.ProductSubscriptionService
+	userRepo                   user_repositories.UserRepository
 	logger                     *zap.Logger
 }

 // NewSubscriptionApplicationService 创建订阅应用服务
 func NewSubscriptionApplicationService(
 	productSubscriptionService *product_service.ProductSubscriptionService,
+	userRepo user_repositories.UserRepository,
 	logger *zap.Logger,
 ) SubscriptionApplicationService {
 	return &SubscriptionApplicationServiceImpl{
 		productSubscriptionService: productSubscriptionService,
+		userRepo:                   userRepo,
 		logger:                     logger,
 	}
 }
@@ -37,19 +38,7 @@ func NewSubscriptionApplicationService(
 // UpdateSubscriptionPrice 更新订阅价格
 // 业务流程：1. 获取订阅 2. 更新价格 3. 保存订阅
 func (s *SubscriptionApplicationServiceImpl) UpdateSubscriptionPrice(ctx context.Context, cmd *commands.UpdateSubscriptionPriceCommand) error {
-	// 1. 获取现有订阅
-	subscription, err := s.productSubscriptionService.GetSubscriptionByID(ctx, cmd.ID)
-	if err != nil {
-		return err
-	}
-
-	// 2. 更新订阅价格
-	subscription.Price = decimal.NewFromFloat(cmd.Price)
-
-	// 3. 保存订阅
-	// 这里需要扩展领域服务来支持更新操作
-	// 暂时返回错误
-	return fmt.Errorf("更新订阅价格功能暂未实现")
+	return s.productSubscriptionService.UpdateSubscriptionPrice(ctx, cmd.ID, cmd.Price)
 }

 // CreateSubscription 创建订阅
@@ -74,12 +63,16 @@ func (s *SubscriptionApplicationServiceImpl) GetSubscriptionByID(ctx context.Con
 // 业务流程：1. 获取订阅列表 2. 构建响应数据
 func (s *SubscriptionApplicationServiceImpl) ListSubscriptions(ctx context.Context, query *appQueries.ListSubscriptionsQuery) (*responses.SubscriptionListResponse, error) {
 	repoQuery := &repoQueries.ListSubscriptionsQuery{
-		Page:      query.Page,
-		PageSize:  query.PageSize,
-		UserID:    query.UserID, // 管理员可以按用户筛选
-		Keyword:   query.Keyword,
-		SortBy:    query.SortBy,
-		SortOrder: query.SortOrder,
+		Page:        query.Page,
+		PageSize:    query.PageSize,
+		UserID:      query.UserID, // 管理员可以按用户筛选
+		Keyword:     query.Keyword,
+		SortBy:      query.SortBy,
+		SortOrder:   query.SortOrder,
+		CompanyName: query.CompanyName,
+		ProductName: query.ProductName,
+		StartTime:   query.StartTime,
+		EndTime:     query.EndTime,
 	}
 	subscriptions, total, err := s.productSubscriptionService.ListSubscriptions(ctx, repoQuery)
 	if err != nil {
@@ -104,12 +97,16 @@ func (s *SubscriptionApplicationServiceImpl) ListSubscriptions(ctx context.Conte
 // 业务流程：1. 获取用户订阅列表 2. 构建响应数据
 func (s *SubscriptionApplicationServiceImpl) ListMySubscriptions(ctx context.Context, userID string, query *appQueries.ListSubscriptionsQuery) (*responses.SubscriptionListResponse, error) {
 	repoQuery := &repoQueries.ListSubscriptionsQuery{
-		Page:      query.Page,
-		PageSize:  query.PageSize,
-		UserID:    userID, // 强制设置为当前用户ID
-		Keyword:   query.Keyword,
-		SortBy:    query.SortBy,
-		SortOrder: query.SortOrder,
+		Page:        query.Page,
+		PageSize:    query.PageSize,
+		UserID:      userID, // 强制设置为当前用户ID
+		Keyword:     query.Keyword,
+		SortBy:      query.SortBy,
+		SortOrder:   query.SortOrder,
+		CompanyName: query.CompanyName,
+		ProductName: query.ProductName,
+		StartTime:   query.StartTime,
+		EndTime:     query.EndTime,
 	}
 	subscriptions, total, err := s.productSubscriptionService.ListSubscriptions(ctx, repoQuery)
 	if err != nil {
@@ -173,42 +170,56 @@ func (s *SubscriptionApplicationServiceImpl) GetSubscriptionUsage(ctx context.Co
 // GetSubscriptionStats 获取订阅统计信息
 // 业务流程：1. 获取订阅统计 2. 构建响应数据
 func (s *SubscriptionApplicationServiceImpl) GetSubscriptionStats(ctx context.Context) (*responses.SubscriptionStatsResponse, error) {
-	// 这里需要扩展领域服务来支持统计功能
-	// 暂时返回默认值
+	stats, err := s.productSubscriptionService.GetSubscriptionStats(ctx)
+	if err != nil {
+		return nil, err
+	}
+	
 	return &responses.SubscriptionStatsResponse{
-		TotalSubscriptions: 0,
-		TotalRevenue: 0,
+		TotalSubscriptions: stats["total_subscriptions"].(int64),
+		TotalRevenue:       stats["total_revenue"].(float64),
 	}, nil
 }

 // GetMySubscriptionStats 获取我的订阅统计信息
 // 业务流程：1. 获取用户订阅统计 2. 构建响应数据
 func (s *SubscriptionApplicationServiceImpl) GetMySubscriptionStats(ctx context.Context, userID string) (*responses.SubscriptionStatsResponse, error) {
-	// 获取用户订阅数量
-	subscriptions, err := s.productSubscriptionService.GetUserSubscriptions(ctx, userID)
+	stats, err := s.productSubscriptionService.GetUserSubscriptionStats(ctx, userID)
 	if err != nil {
 		return nil, err
 	}
-
-	// 计算总收益
-	var totalRevenue float64
-	for _, subscription := range subscriptions {
-		totalRevenue += subscription.Price.InexactFloat64()
-	}
-
+	
 	return &responses.SubscriptionStatsResponse{
-		TotalSubscriptions: int64(len(subscriptions)),
-		TotalRevenue: totalRevenue,
+		TotalSubscriptions: stats["total_subscriptions"].(int64),
+		TotalRevenue:       stats["total_revenue"].(float64),
 	}, nil
 }

 // convertToSubscriptionInfoResponse 转换为订阅信息响应
 func (s *SubscriptionApplicationServiceImpl) convertToSubscriptionInfoResponse(subscription *entities.Subscription) *responses.SubscriptionInfoResponse {
+	// 查询用户信息
+	var userInfo *responses.UserSimpleResponse
+	if subscription.UserID != "" {
+		user, err := s.userRepo.GetByIDWithEnterpriseInfo(context.Background(), subscription.UserID)
+		if err == nil {
+			companyName := "未知公司"
+			if user.EnterpriseInfo != nil {
+				companyName = user.EnterpriseInfo.CompanyName
+			}
+			userInfo = &responses.UserSimpleResponse{
+				ID:          user.ID,
+				CompanyName: companyName,
+				Phone:       user.Phone,
+			}
+		}
+	}
+
 	return &responses.SubscriptionInfoResponse{
 		ID:        subscription.ID,
 		UserID:    subscription.UserID,
 		ProductID: subscription.ProductID,
 		Price:     subscription.Price.InexactFloat64(),
+		User:      userInfo,
 		Product:   s.convertToProductSimpleResponse(subscription.Product),
 		APIUsed:   subscription.APIUsed,
 		CreatedAt: subscription.CreatedAt,