temp

2025-07-20 20:53:26 +08:00
parent 83bf9aea7d
commit 8ad1d7288e
158 changed files with 18156 additions and 13188 deletions
--- a/internal/application/user/user_application_service_impl.go
+++ b/internal/application/user/user_application_service_impl.go
@@ -11,62 +11,59 @@ import (
 	"tyapi-server/internal/application/user/dto/responses"
 	"tyapi-server/internal/domains/user/entities"
 	"tyapi-server/internal/domains/user/events"
-	"tyapi-server/internal/domains/user/repositories"
 	user_service "tyapi-server/internal/domains/user/services"
 	"tyapi-server/internal/shared/interfaces"
 	"tyapi-server/internal/shared/middleware"
 )

 // UserApplicationServiceImpl 用户应用服务实现
+// 负责业务流程编排、事务管理、数据转换，不直接操作仓库
 type UserApplicationServiceImpl struct {
-	userRepo           repositories.UserRepository
-	enterpriseInfoRepo repositories.EnterpriseInfoRepository
-	smsCodeService     *user_service.SMSCodeService
-	eventBus           interfaces.EventBus
-	jwtAuth            *middleware.JWTAuthMiddleware
-	logger             *zap.Logger
+	userManagementService *user_service.UserManagementService
+	userAuthService       *user_service.UserAuthService
+	smsCodeService        *user_service.SMSCodeService
+	enterpriseService     *user_service.EnterpriseService
+	eventBus              interfaces.EventBus
+	jwtAuth               *middleware.JWTAuthMiddleware
+	logger                *zap.Logger
 }

 // NewUserApplicationService 创建用户应用服务
 func NewUserApplicationService(
-	userRepo repositories.UserRepository,
-	enterpriseInfoRepo repositories.EnterpriseInfoRepository,
+	userManagementService *user_service.UserManagementService,
+	userAuthService *user_service.UserAuthService,
 	smsCodeService *user_service.SMSCodeService,
+	enterpriseService *user_service.EnterpriseService,
 	eventBus interfaces.EventBus,
 	jwtAuth *middleware.JWTAuthMiddleware,
 	logger *zap.Logger,
 ) UserApplicationService {
 	return &UserApplicationServiceImpl{
-		userRepo:           userRepo,
-		enterpriseInfoRepo: enterpriseInfoRepo,
-		smsCodeService:     smsCodeService,
-		eventBus:           eventBus,
-		jwtAuth:            jwtAuth,
-		logger:             logger,
+		userManagementService: userManagementService,
+		userAuthService:       userAuthService,
+		smsCodeService:        smsCodeService,
+		enterpriseService:     enterpriseService,
+		eventBus:              eventBus,
+		jwtAuth:               jwtAuth,
+		logger:                logger,
 	}
 }

 // Register 用户注册
+// 业务流程：1. 验证短信验证码 2. 创建用户 3. 发布注册事件
 func (s *UserApplicationServiceImpl) Register(ctx context.Context, cmd *commands.RegisterUserCommand) (*responses.RegisterUserResponse, error) {
+	// 1. 验证短信验证码
 	if err := s.smsCodeService.VerifyCode(ctx, cmd.Phone, cmd.Code, entities.SMSSceneRegister); err != nil {
 		return nil, fmt.Errorf("验证码错误或已过期")
 	}

-	if _, err := s.userRepo.GetByPhone(ctx, cmd.Phone); err == nil {
-		return nil, fmt.Errorf("手机号已存在")
-	}
-
-	user, err := entities.NewUser(cmd.Phone, cmd.Password)
+	// 2. 创建用户
+	user, err := s.userManagementService.CreateUser(ctx, cmd.Phone, cmd.Password)
 	if err != nil {
-		return nil, fmt.Errorf("创建用户失败: %w", err)
-	}
-
-	createdUser, err := s.userRepo.Create(ctx, *user)
-	if err != nil {
-		s.logger.Error("创建用户失败", zap.Error(err))
-		return nil, fmt.Errorf("创建用户失败: %w", err)
+		return nil, err
 	}

+	// 3. 发布用户注册事件
 	event := events.NewUserRegisteredEvent(user, "")
 	if err := s.eventBus.Publish(ctx, event); err != nil {
 		s.logger.Warn("发布用户注册事件失败", zap.Error(err))
@@ -75,35 +72,63 @@ func (s *UserApplicationServiceImpl) Register(ctx context.Context, cmd *commands
 	s.logger.Info("用户注册成功", zap.String("user_id", user.ID), zap.String("phone", user.Phone))

 	return &responses.RegisterUserResponse{
-		ID:    createdUser.ID,
+		ID:    user.ID,
 		Phone: user.Phone,
 	}, nil
 }

 // LoginWithPassword 密码登录
+// 业务流程：1. 验证用户密码 2. 生成访问令牌 3. 更新登录统计 4. 获取用户权限
 func (s *UserApplicationServiceImpl) LoginWithPassword(ctx context.Context, cmd *commands.LoginWithPasswordCommand) (*responses.LoginUserResponse, error) {
-	user, err := s.userRepo.GetByPhone(ctx, cmd.Phone)
+	// 1. 验证用户密码
+	user, err := s.userAuthService.ValidatePassword(ctx, cmd.Phone, cmd.Password)
 	if err != nil {
-		return nil, fmt.Errorf("用户名或密码错误")
+		return nil, err
 	}

-	if !user.CanLogin() {
-		return nil, fmt.Errorf("用户状态异常，无法登录")
-	}
-
-	if !user.CheckPassword(cmd.Password) {
-		return nil, fmt.Errorf("用户名或密码错误")
-	}
-
-	accessToken, err := s.jwtAuth.GenerateToken(user.ID, user.Phone, user.Phone)
+	// 2. 生成包含用户类型的token
+	accessToken, err := s.jwtAuth.GenerateToken(user.ID, user.Phone, user.Phone, user.UserType)
 	if err != nil {
 		s.logger.Error("生成令牌失败", zap.Error(err))
 		return nil, fmt.Errorf("生成访问令牌失败")
 	}

-	userProfile, err := s.GetUserProfile(ctx, user.ID)
-	if err != nil {
-		return nil, fmt.Errorf("获取用户信息失败: %w", err)
+	// 3. 如果是管理员，更新登录统计
+	if user.IsAdmin() {
+		if err := s.userManagementService.UpdateLoginStats(ctx, user.ID); err != nil {
+			s.logger.Error("更新登录统计失败", zap.Error(err))
+		}
+		// 重新获取用户信息以获取最新的登录统计
+		updatedUser, err := s.userManagementService.GetUserByID(ctx, user.ID)
+		if err != nil {
+			s.logger.Error("重新获取用户信息失败", zap.Error(err))
+		} else {
+			user = updatedUser
+		}
+	}
+
+	// 4. 获取用户权限（仅管理员）
+	var permissions []string
+	if user.IsAdmin() {
+		permissions, err = s.userAuthService.GetUserPermissions(ctx, user)
+		if err != nil {
+			s.logger.Error("获取用户权限失败", zap.Error(err))
+			permissions = []string{}
+		}
+	}
+
+	// 5. 构建用户信息
+	userProfile := &responses.UserProfileResponse{
+		ID:          user.ID,
+		Phone:       user.Phone,
+		Username:    user.Username,
+		UserType:    user.UserType,
+		IsActive:    user.Active,
+		LastLoginAt: user.LastLoginAt,
+		LoginCount:  user.LoginCount,
+		Permissions: permissions,
+		CreatedAt:   user.CreatedAt,
+		UpdatedAt:   user.UpdatedAt,
 	}

 	return &responses.LoginUserResponse{
@@ -116,140 +141,163 @@ func (s *UserApplicationServiceImpl) LoginWithPassword(ctx context.Context, cmd
 }

 // LoginWithSMS 短信验证码登录
+// 业务流程：1. 验证短信验证码 2. 验证用户登录状态 3. 生成访问令牌 4. 更新登录统计 5. 获取用户权限
 func (s *UserApplicationServiceImpl) LoginWithSMS(ctx context.Context, cmd *commands.LoginWithSMSCommand) (*responses.LoginUserResponse, error) {
+	// 1. 验证短信验证码
 	if err := s.smsCodeService.VerifyCode(ctx, cmd.Phone, cmd.Code, entities.SMSSceneLogin); err != nil {
 		return nil, fmt.Errorf("验证码错误或已过期")
 	}

-	user, err := s.userRepo.GetByPhone(ctx, cmd.Phone)
+	// 2. 验证用户登录状态
+	user, err := s.userAuthService.ValidateUserLogin(ctx, cmd.Phone)
 	if err != nil {
-		return nil, fmt.Errorf("用户不存在")
+		return nil, err
 	}

-	if !user.CanLogin() {
-		return nil, fmt.Errorf("用户状态异常，无法登录")
-	}
-
-	accessToken, err := s.jwtAuth.GenerateToken(user.ID, user.Phone, user.Phone)
+	// 3. 生成包含用户类型的token
+	accessToken, err := s.jwtAuth.GenerateToken(user.ID, user.Phone, user.Phone, user.UserType)
 	if err != nil {
 		s.logger.Error("生成令牌失败", zap.Error(err))
 		return nil, fmt.Errorf("生成访问令牌失败")
 	}

-	userProfile, err := s.GetUserProfile(ctx, user.ID)
-	if err != nil {
-		return nil, fmt.Errorf("获取用户信息失败: %w", err)
+	// 4. 如果是管理员，更新登录统计
+	if user.IsAdmin() {
+		if err := s.userManagementService.UpdateLoginStats(ctx, user.ID); err != nil {
+			s.logger.Error("更新登录统计失败", zap.Error(err))
+		}
+		// 重新获取用户信息以获取最新的登录统计
+		updatedUser, err := s.userManagementService.GetUserByID(ctx, user.ID)
+		if err != nil {
+			s.logger.Error("重新获取用户信息失败", zap.Error(err))
+		} else {
+			user = updatedUser
+		}
+	}
+
+	// 5. 获取用户权限（仅管理员）
+	var permissions []string
+	if user.IsAdmin() {
+		permissions, err = s.userAuthService.GetUserPermissions(ctx, user)
+		if err != nil {
+			s.logger.Error("获取用户权限失败", zap.Error(err))
+			permissions = []string{}
+		}
+	}
+
+	// 6. 构建用户信息
+	userProfile := &responses.UserProfileResponse{
+		ID:          user.ID,
+		Phone:       user.Phone,
+		Username:    user.Username,
+		UserType:    user.UserType,
+		IsActive:    user.Active,
+		LastLoginAt: user.LastLoginAt,
+		LoginCount:  user.LoginCount,
+		Permissions: permissions,
+		CreatedAt:   user.CreatedAt,
+		UpdatedAt:   user.UpdatedAt,
 	}

 	return &responses.LoginUserResponse{
 		User:        userProfile,
 		AccessToken: accessToken,
 		TokenType:   "Bearer",
-		ExpiresIn:   86400, // 24h
+		ExpiresIn:   int64(s.jwtAuth.GetExpiresIn().Seconds()), // 168h
 		LoginMethod: "sms",
 	}, nil
 }

+// SendSMS 发送短信验证码
+// 业务流程：1. 发送短信验证码
+func (s *UserApplicationServiceImpl) SendSMS(ctx context.Context, cmd *commands.SendCodeCommand) error {
+	return s.smsCodeService.SendCode(ctx, cmd.Phone, entities.SMSScene(cmd.Scene), "", "")
+}
+
 // ChangePassword 修改密码
+// 业务流程：1. 修改用户密码
 func (s *UserApplicationServiceImpl) ChangePassword(ctx context.Context, cmd *commands.ChangePasswordCommand) error {
-	user, err := s.userRepo.GetByID(ctx, cmd.UserID)
-	if err != nil {
-		return fmt.Errorf("用户不存在: %w", err)
-	}
-
-	if err := s.smsCodeService.VerifyCode(ctx, user.Phone, cmd.Code, entities.SMSSceneChangePassword); err != nil {
-		return fmt.Errorf("验证码错误或已过期")
-	}
-
-	if err := user.ChangePassword(cmd.OldPassword, cmd.NewPassword, cmd.ConfirmNewPassword); err != nil {
-		return err
-	}
-
-	if err := s.userRepo.Update(ctx, user); err != nil {
-		return fmt.Errorf("密码更新失败: %w", err)
-	}
-
-	event := events.NewUserPasswordChangedEvent(user.ID, user.Phone, "")
-	if err := s.eventBus.Publish(ctx, event); err != nil {
-		s.logger.Warn("发布密码修改事件失败", zap.Error(err))
-	}
-
-	s.logger.Info("密码修改成功", zap.String("user_id", cmd.UserID))
-	return nil
+	return s.userAuthService.ChangePassword(ctx, cmd.UserID, cmd.OldPassword, cmd.NewPassword)
 }

 // ResetPassword 重置密码
+// 业务流程：1. 验证短信验证码 2. 重置用户密码
 func (s *UserApplicationServiceImpl) ResetPassword(ctx context.Context, cmd *commands.ResetPasswordCommand) error {
-	user, err := s.userRepo.GetByPhone(ctx, cmd.Phone)
-	if err != nil {
-		return fmt.Errorf("用户不存在")
-	}
-
+	// 1. 验证短信验证码
 	if err := s.smsCodeService.VerifyCode(ctx, cmd.Phone, cmd.Code, entities.SMSSceneResetPassword); err != nil {
 		return fmt.Errorf("验证码错误或已过期")
 	}

-	if err := user.ResetPassword(cmd.NewPassword, cmd.ConfirmNewPassword); err != nil {
-		return err
-	}
-
-	if err := s.userRepo.Update(ctx, *user); err != nil {
-		return fmt.Errorf("密码更新失败: %w", err)
-	}
-
-	event := events.NewUserPasswordChangedEvent(user.ID, user.Phone, "")
-	if err := s.eventBus.Publish(ctx, event); err != nil {
-		s.logger.Warn("发布密码重置事件失败", zap.Error(err))
-	}
-
-	s.logger.Info("密码重置成功", zap.String("user_id", user.ID), zap.String("phone", user.Phone))
-	return nil
+	// 2. 重置用户密码
+	return s.userAuthService.ResetPassword(ctx, cmd.Phone, cmd.NewPassword)
 }

-// GetUserProfile 获取用户信息
+// GetUserProfile 获取用户资料
+// 业务流程：1. 获取用户信息 2. 获取企业信息 3. 构建响应数据
 func (s *UserApplicationServiceImpl) GetUserProfile(ctx context.Context, userID string) (*responses.UserProfileResponse, error) {
-	if userID == "" {
-		return nil, fmt.Errorf("用户ID不能为空")
-	}
-
-	user, err := s.userRepo.GetByID(ctx, userID)
+	// 1. 获取用户信息（包含企业信息）
+	user, err := s.enterpriseService.GetUserWithEnterpriseInfo(ctx, userID)
 	if err != nil {
-		return nil, fmt.Errorf("用户不存在: %w", err)
+		return nil, err
 	}

-	response := &responses.UserProfileResponse{
-		ID:        user.ID,
-		Phone:     user.Phone,
-		CreatedAt: user.CreatedAt,
-		UpdatedAt: user.UpdatedAt,
-	}
-
-	// 获取企业信息（如果存在）
-	enterpriseInfo, err := s.enterpriseInfoRepo.GetByUserID(ctx, userID)
-	if err != nil {
-		s.logger.Debug("用户暂无企业信息", zap.String("user_id", userID))
-		response.IsCertified = false
-	} else {
-		response.EnterpriseInfo = &responses.EnterpriseInfoResponse{
-			ID:                enterpriseInfo.ID,
-			CompanyName:       enterpriseInfo.CompanyName,
-			UnifiedSocialCode: enterpriseInfo.UnifiedSocialCode,
-			LegalPersonName:   enterpriseInfo.LegalPersonName,
-			LegalPersonID:     enterpriseInfo.LegalPersonID,
-			IsOCRVerified:     enterpriseInfo.IsOCRVerified,
-			IsFaceVerified:    enterpriseInfo.IsFaceVerified,
-			IsCertified:       enterpriseInfo.IsCertified,
-			CertifiedAt:       enterpriseInfo.CertifiedAt,
-			CreatedAt:         enterpriseInfo.CreatedAt,
-			UpdatedAt:         enterpriseInfo.UpdatedAt,
+	// 2. 获取用户权限（仅管理员）
+	var permissions []string
+	if user.IsAdmin() {
+		permissions, err = s.userAuthService.GetUserPermissions(ctx, user)
+		if err != nil {
+			s.logger.Error("获取用户权限失败", zap.Error(err))
+			permissions = []string{}
 		}
-		response.IsCertified = enterpriseInfo.IsCertified
 	}

-	return response, nil
+	// 3. 构建用户信息
+	userProfile := &responses.UserProfileResponse{
+		ID:          user.ID,
+		Phone:       user.Phone,
+		Username:    user.Username,
+		UserType:    user.UserType,
+		IsActive:    user.Active,
+		LastLoginAt: user.LastLoginAt,
+		LoginCount:  user.LoginCount,
+		Permissions: permissions,
+		CreatedAt:   user.CreatedAt,
+		UpdatedAt:   user.UpdatedAt,
+	}
+
+	// 4. 添加企业信息
+	if user.EnterpriseInfo != nil {
+		userProfile.EnterpriseInfo = &responses.EnterpriseInfoResponse{
+			ID:                user.EnterpriseInfo.ID,
+			CompanyName:       user.EnterpriseInfo.CompanyName,
+			UnifiedSocialCode: user.EnterpriseInfo.UnifiedSocialCode,
+			LegalPersonName:   user.EnterpriseInfo.LegalPersonName,
+			LegalPersonID:     user.EnterpriseInfo.LegalPersonID,
+			CreatedAt:         user.EnterpriseInfo.CreatedAt,
+			UpdatedAt:         user.EnterpriseInfo.UpdatedAt,
+		}
+	}
+
+	return userProfile, nil
 }

+// GetUser 获取用户信息
+// 业务流程：1. 获取用户信息 2. 构建响应数据
 func (s *UserApplicationServiceImpl) GetUser(ctx context.Context, query *queries.GetUserQuery) (*responses.UserProfileResponse, error) {
-	// ... implementation
-	return nil, fmt.Errorf("not implemented")
+	user, err := s.userManagementService.GetUserByID(ctx, query.UserID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &responses.UserProfileResponse{
+		ID:          user.ID,
+		Phone:       user.Phone,
+		Username:    user.Username,
+		UserType:    user.UserType,
+		IsActive:    user.Active,
+		LastLoginAt: user.LastLoginAt,
+		LoginCount:  user.LoginCount,
+		CreatedAt:   user.CreatedAt,
+		UpdatedAt:   user.UpdatedAt,
+	}, nil
 }