From 10d086414b4c4d322884ec7b9b2555e46467d6e1 Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Mon, 28 Jul 2025 23:44:01 +0800
Subject: [PATCH] fix

---
 .../api/api_application_service.go            | 24 ++++++-----
 internal/application/api/dto/api_response.go  |  5 ++-
 .../application/api/utils/error_translator.go | 40 +++++++++++++++++++
 internal/domains/api/entities/api_call.go     |  7 ++--
 .../api/repositories/api_call_repository.go   | 12 +++---
 .../http/handlers/api_handler.go              |  4 +-
 6 files changed, 68 insertions(+), 24 deletions(-)
 create mode 100644 internal/application/api/utils/error_translator.go

diff --git a/internal/application/api/api_application_service.go b/internal/application/api/api_application_service.go
index db88b65..510fb2d 100644
--- a/internal/application/api/api_application_service.go
+++ b/internal/application/api/api_application_service.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"tyapi-server/internal/application/api/commands"
 	"tyapi-server/internal/application/api/dto"
+	"tyapi-server/internal/application/api/utils"
 	"tyapi-server/internal/config"
 	entities "tyapi-server/internal/domains/api/entities"
 	"tyapi-server/internal/domains/api/repositories"
@@ -80,6 +81,14 @@ func (s *ApiApplicationServiceImpl) CallApi(ctx context.Context, cmd *commands.A
 			businessError = ErrInvalidAccessId
 			return ErrInvalidAccessId
 		}
+		// 3. 查产品
+		product, err := s.productManagementService.GetProductByCode(txCtx, cmd.ApiName)
+		if err != nil {
+			s.logger.Error("查产品失败", zap.Error(err))
+			businessError = ErrProductNotFound
+			return ErrProductNotFound
+		}
+		apiCall.ProductId = &product.ID
 		// 加入UserId
 		apiCall.UserId = &apiUser.UserId
 		if apiUser.IsFrozen() {
@@ -109,14 +118,6 @@ func (s *ApiApplicationServiceImpl) CallApi(ctx context.Context, cmd *commands.A
 			businessError = ErrArrears
 			return ErrArrears
 		}
-
-		// 3. 查产品
-		product, err := s.productManagementService.GetProductByCode(txCtx, cmd.ApiName)
-		if err != nil {
-			s.logger.Error("查产品失败", zap.Error(err))
-			businessError = ErrProductNotFound
-			return ErrProductNotFound
-		}
 		// 4. 查订阅
 		subscription, err := s.productSubscriptionService.GetUserSubscribedProduct(txCtx, apiUser.UserId, product.ID)
 		if err != nil {
@@ -129,7 +130,6 @@ func (s *ApiApplicationServiceImpl) CallApi(ctx context.Context, cmd *commands.A
 			businessError = ErrNotSubscribed
 			return ErrNotSubscribed
 		}
-		apiCall.ProductId = &product.ID
 		if !product.IsValid() {
 			s.logger.Error("产品已停用", zap.String("productId", product.ID))
 			businessError = ErrProductDisabled
@@ -172,7 +172,7 @@ func (s *ApiApplicationServiceImpl) CallApi(ctx context.Context, cmd *commands.A
 			businessError = ErrSystem
 			return ErrSystem
 		}
-		apiCall.ResponseData = &encryptedResponse
+		// apiCall.ResponseData = &encryptedResponse
 
 		// 8. 更新订阅使用次数
 		subscription.IncrementAPIUsage(1)
@@ -193,7 +193,7 @@ func (s *ApiApplicationServiceImpl) CallApi(ctx context.Context, cmd *commands.A
 		apiCall.Cost = &subscription.Price
 
 		// 10. 标记成功
-		apiCall.MarkSuccess(encryptedResponse, subscription.Price)
+		apiCall.MarkSuccess(subscription.Price)
 		return nil
 	})
 
@@ -392,6 +392,8 @@ func (s *ApiApplicationServiceImpl) GetUserApiCalls(ctx context.Context, userID
 		}
 		if call.ErrorMsg != nil {
 			item.ErrorMsg = call.ErrorMsg
+			// 添加翻译后的错误信息
+			item.TranslatedErrorMsg = utils.TranslateErrorMsg(call.ErrorType, call.ErrorMsg)
 		}
 
 		items = append(items, item)
diff --git a/internal/application/api/dto/api_response.go b/internal/application/api/dto/api_response.go
index 11a1215..990363d 100644
--- a/internal/application/api/dto/api_response.go
+++ b/internal/application/api/dto/api_response.go
@@ -53,6 +53,7 @@ type ApiCallRecordResponse struct {
 	Cost          *string `json:"cost,omitempty"`
 	ErrorType     *string `json:"error_type,omitempty"`
 	ErrorMsg      *string `json:"error_msg,omitempty"`
+	TranslatedErrorMsg *string `json:"translated_error_msg,omitempty"`
 	CreatedAt     string  `json:"created_at"`
 	UpdatedAt     string  `json:"updated_at"`
 }
@@ -87,4 +88,6 @@ func NewErrorResponse(code int, message, transactionId string) *ApiCallResponse
 		TransactionId: transactionId,
 		Data: "",
 	}
-} 
\ No newline at end of file
+}
+
+ 
\ No newline at end of file
diff --git a/internal/application/api/utils/error_translator.go b/internal/application/api/utils/error_translator.go
new file mode 100644
index 0000000..b6a35ae
--- /dev/null
+++ b/internal/application/api/utils/error_translator.go
@@ -0,0 +1,40 @@
+package utils
+
+// TranslateErrorMsg 翻译错误信息
+func TranslateErrorMsg(errorType, errorMsg *string) *string {
+	if errorType == nil || errorMsg == nil {
+		return nil
+	}
+
+	// 错误类型到中文描述的映射
+	errorTypeTranslations := map[string]string{
+		"invalid_access":    "无效的访问凭证",
+		"frozen_account":    "账户已被冻结",
+		"invalid_ip":        "IP地址未授权",
+		"arrears":           "账户余额不足",
+		"not_subscribed":    "未订阅该产品",
+		"product_not_found": "产品不存在",
+		"product_disabled":  "产品已停用",
+		"system_error":      "系统内部错误",
+		"datasource_error":  "数据源异常",
+		"invalid_param":     "参数校验失败",
+		"decrypt_fail":      "参数解密失败",
+		"query_empty":       "查询结果为空",
+	}
+
+	// 获取错误类型的中文描述
+	translatedType, exists := errorTypeTranslations[*errorType]
+	if !exists {
+		// 如果没有找到对应的翻译，返回原始错误信息
+		return errorMsg
+	}
+
+	// 构建翻译后的错误信息
+	translatedMsg := translatedType
+	if *errorMsg != "" && *errorMsg != *errorType {
+		// 如果原始错误信息不是错误类型本身，则组合显示
+		translatedMsg = translatedType + "：" + *errorMsg
+	}
+
+	return &translatedMsg
+} 
\ No newline at end of file
diff --git a/internal/domains/api/entities/api_call.go b/internal/domains/api/entities/api_call.go
index 17fbd31..8a8da6d 100644
--- a/internal/domains/api/entities/api_call.go
+++ b/internal/domains/api/entities/api_call.go
@@ -94,17 +94,16 @@ func NewApiCall(accessId, requestParams, clientIp string) (*ApiCall, error) {
 }
 
 // MarkSuccess 标记为成功
-func (a *ApiCall) MarkSuccess(responseData string, cost decimal.Decimal) error {
+func (a *ApiCall) MarkSuccess(cost decimal.Decimal) error {
 	// 校验除ErrorMsg和ErrorType外所有字段不能为空
 	if a.ID == "" || a.AccessId == "" || a.TransactionId == "" || a.RequestParams == "" || a.Status == "" || a.StartAt.IsZero() {
 		return errors.New("ApiCall字段不能为空（除ErrorMsg和ErrorType）")
 	}
 	// 可选字段也要有值
-	if a.UserId == nil || a.ProductId == nil || responseData == "" {
-		return errors.New("ApiCall标记成功时UserId、ProductId、ResponseData不能为空")
+	if a.UserId == nil || a.ProductId == nil  {
+		return errors.New("ApiCall标记成功时UserId、ProductId不能为空")
 	}
 	a.Status = ApiCallStatusSuccess
-	a.ResponseData = &responseData
 	endAt := time.Now()
 	a.EndAt = &endAt
 	a.Cost = &cost
diff --git a/internal/domains/api/repositories/api_call_repository.go b/internal/domains/api/repositories/api_call_repository.go
index 6fc6094..b634d9e 100644
--- a/internal/domains/api/repositories/api_call_repository.go
+++ b/internal/domains/api/repositories/api_call_repository.go
@@ -11,19 +11,19 @@ type ApiCallRepository interface {
 	Update(ctx context.Context, call *entities.ApiCall) error
 	FindById(ctx context.Context, id string) (*entities.ApiCall, error)
 	FindByUserId(ctx context.Context, userId string, limit, offset int) ([]*entities.ApiCall, error)
-	
+
 	// 新增：分页查询用户API调用记录
 	ListByUserId(ctx context.Context, userId string, options interfaces.ListOptions) ([]*entities.ApiCall, int64, error)
-	
+
 	// 新增：根据条件筛选API调用记录
 	ListByUserIdWithFilters(ctx context.Context, userId string, filters map[string]interface{}, options interfaces.ListOptions) ([]*entities.ApiCall, int64, error)
-	
+
 	// 新增：根据条件筛选API调用记录（包含产品名称）
 	ListByUserIdWithFiltersAndProductName(ctx context.Context, userId string, filters map[string]interface{}, options interfaces.ListOptions) (map[string]string, []*entities.ApiCall, int64, error)
-	
+
 	// 新增：统计用户API调用次数
 	CountByUserId(ctx context.Context, userId string) (int64, error)
-	
+
 	// 新增：根据TransactionID查询
 	FindByTransactionId(ctx context.Context, transactionId string) (*entities.ApiCall, error)
-} 
\ No newline at end of file
+}
diff --git a/internal/infrastructure/http/handlers/api_handler.go b/internal/infrastructure/http/handlers/api_handler.go
index 42b7b0b..e43fc99 100644
--- a/internal/infrastructure/http/handlers/api_handler.go
+++ b/internal/infrastructure/http/handlers/api_handler.go
@@ -282,12 +282,12 @@ func (h *ApiHandler) GetUserApiCalls(c *gin.Context) {
 	if transactionId := c.Query("transaction_id"); transactionId != "" {
 		filters["transaction_id"] = transactionId
 	}
-	
+
 	// 产品名称筛选
 	if productName := c.Query("product_name"); productName != "" {
 		filters["product_name"] = productName
 	}
-	
+
 	// 状态筛选
 	if status := c.Query("status"); status != "" {
 		filters["status"] = status