v1.0.0

internal/application/finance/finance_application_service_impl.go

@@ -11,6 +11,7 @@ import (
 	finance_entities "tyapi-server/internal/domains/finance/entities"
 	finance_repositories "tyapi-server/internal/domains/finance/repositories"
 	finance_services "tyapi-server/internal/domains/finance/services"
+	user_repositories "tyapi-server/internal/domains/user/repositories"
 	"tyapi-server/internal/shared/database"
 	"tyapi-server/internal/shared/interfaces"
 	"tyapi-server/internal/shared/payment"
@@ -27,6 +28,7 @@ type FinanceApplicationServiceImpl struct {
 	rechargeRecordService       finance_services.RechargeRecordService
 	walletTransactionRepository finance_repositories.WalletTransactionRepository
 	alipayOrderRepo             finance_repositories.AlipayOrderRepository
+	userRepo                    user_repositories.UserRepository
 	txManager                   *database.TransactionManager
 	logger                      *zap.Logger
 	config                      *config.Config
@@ -39,6 +41,7 @@ func NewFinanceApplicationService(
 	rechargeRecordService finance_services.RechargeRecordService,
 	walletTransactionRepository finance_repositories.WalletTransactionRepository,
 	alipayOrderRepo finance_repositories.AlipayOrderRepository,
+	userRepo user_repositories.UserRepository,
 	txManager *database.TransactionManager,
 	logger *zap.Logger,
 	config *config.Config,
@@ -49,6 +52,7 @@ func NewFinanceApplicationService(
 		rechargeRecordService:       rechargeRecordService,
 		walletTransactionRepository: walletTransactionRepository,
 		alipayOrderRepo:             alipayOrderRepo,
+		userRepo:                    userRepo,
 		txManager:                   txManager,
 		logger:                      logger,
 		config:                      config,
@@ -290,6 +294,55 @@ func (s *FinanceApplicationServiceImpl) GetUserWalletTransactions(ctx context.Co
 	}, nil
 }
 
+// GetAdminWalletTransactions 获取管理端钱包交易记录
+func (s *FinanceApplicationServiceImpl) GetAdminWalletTransactions(ctx context.Context, filters map[string]interface{}, options interfaces.ListOptions) (*responses.WalletTransactionListResponse, error) {
+	// 查询钱包交易记录（包含产品名称）
+	productNameMap, transactions, total, err := s.walletTransactionRepository.ListWithFiltersAndProductName(ctx, filters, options)
+	if err != nil {
+		s.logger.Error("查询管理端钱包交易记录失败", zap.Error(err))
+		return nil, err
+	}
+
+	// 转换为响应DTO
+	var items []responses.WalletTransactionResponse
+	for _, transaction := range transactions {
+		item := responses.WalletTransactionResponse{
+			ID:            transaction.ID,
+			UserID:        transaction.UserID,
+			ApiCallID:     transaction.ApiCallID,
+			TransactionID: transaction.TransactionID,
+			ProductID:     transaction.ProductID,
+			ProductName:   productNameMap[transaction.ProductID], // 从映射中获取产品名称
+			Amount:        transaction.Amount,
+			CreatedAt:     transaction.CreatedAt,
+			UpdatedAt:     transaction.UpdatedAt,
+		}
+
+		// 获取用户信息和企业名称
+		user, err := s.userRepo.GetByIDWithEnterpriseInfo(ctx, transaction.UserID)
+		if err == nil {
+			companyName := "未知企业"
+			if user.EnterpriseInfo != nil {
+				companyName = user.EnterpriseInfo.CompanyName
+			}
+			item.CompanyName = companyName
+			item.User = &responses.UserSimpleResponse{
+				ID:          user.ID,
+				CompanyName: companyName,
+				Phone:       user.Phone,
+			}
+		}
+
+		items = append(items, item)
+	}
+
+	return &responses.WalletTransactionListResponse{
+		Items: items,
+		Total: total,
+		Page:  options.Page,
+		Size:  options.PageSize,
+	}, nil
+}
 
 
 // HandleAlipayCallback 处理支付宝回调
@@ -592,19 +645,19 @@ func (s *FinanceApplicationServiceImpl) GetUserRechargeRecords(ctx context.Conte
 	}, nil
 }
 
-// GetAdminRechargeRecords 管理员获取充值记录
+// GetAdminRechargeRecords 获取管理端充值记录
 func (s *FinanceApplicationServiceImpl) GetAdminRechargeRecords(ctx context.Context, filters map[string]interface{}, options interfaces.ListOptions) (*responses.RechargeRecordListResponse, error) {
-	// 查询所有充值记录（管理员可以查看所有用户的充值记录）
+	// 查询充值记录
 	records, err := s.rechargeRecordService.GetAll(ctx, filters, options)
 	if err != nil {
-		s.logger.Error("查询管理员充值记录失败", zap.Error(err))
+		s.logger.Error("查询管理端充值记录失败", zap.Error(err))
 		return nil, err
 	}
 
 	// 获取总数
 	total, err := s.rechargeRecordService.Count(ctx, filters)
 	if err != nil {
-		s.logger.Error("统计管理员充值记录失败", zap.Error(err))
+		s.logger.Error("统计管理端充值记录失败", zap.Error(err))
 		return nil, err
 	}
 
@@ -612,14 +665,14 @@ func (s *FinanceApplicationServiceImpl) GetAdminRechargeRecords(ctx context.Cont
 	var items []responses.RechargeRecordResponse
 	for _, record := range records {
 		item := responses.RechargeRecordResponse{
-			ID:           record.ID,
-			UserID:       record.UserID,
-			Amount:       record.Amount,
-			RechargeType: string(record.RechargeType),
-			Status:       string(record.Status),
-			Notes:        record.Notes,
-			CreatedAt:    record.CreatedAt,
-			UpdatedAt:    record.UpdatedAt,
+			ID:             record.ID,
+			UserID:         record.UserID,
+			Amount:         record.Amount,
+			RechargeType:   string(record.RechargeType),
+			Status:         string(record.Status),
+			Notes:          record.Notes,
+			CreatedAt:      record.CreatedAt,
+			UpdatedAt:      record.UpdatedAt,
 		}
 
 		// 根据充值类型设置相应的订单号
@@ -630,6 +683,21 @@ func (s *FinanceApplicationServiceImpl) GetAdminRechargeRecords(ctx context.Cont
 			item.TransferOrderID = *record.TransferOrderID
 		}
 
+		// 获取用户信息和企业名称
+		user, err := s.userRepo.GetByIDWithEnterpriseInfo(ctx, record.UserID)
+		if err == nil {
+			companyName := "未知企业"
+			if user.EnterpriseInfo != nil {
+				companyName = user.EnterpriseInfo.CompanyName
+			}
+			item.CompanyName = companyName
+			item.User = &responses.UserSimpleResponse{
+				ID:          user.ID,
+				CompanyName: companyName,
+				Phone:       user.Phone,
+			}
+		}
+
 		items = append(items, item)
 	}