v1.0.0

internal/domains/api/services/processors/comb/comb298y_processor.go

@@ -22,5 +22,9 @@ func ProcessCOMB298YRequest(ctx context.Context, params []byte, deps *processors
 
 	// 调用组合包服务处理请求
 	// Options会自动传递给所有子处理器
-	return deps.CombService.ProcessCombRequest(ctx, params, deps, "COMB298Y")
+	combinedResult, err := deps.CombService.ProcessCombRequest(ctx, params, deps, "COMB298Y")
+	if err != nil {
+		return nil, err
+	}
+	return json.Marshal(combinedResult)
 }

internal/domains/api/services/processors/comb/comb86pm_processor.go

@@ -22,5 +22,15 @@ func ProcessCOMB86PMRequest(ctx context.Context, params []byte, deps *processors
 
 	// 调用组合包服务处理请求
 	// Options会自动传递给所有子处理器
-	return deps.CombService.ProcessCombRequest(ctx, params, deps, "COMB86PM")
+	combinedResult, err := deps.CombService.ProcessCombRequest(ctx, params, deps, "COMB86PM")
+	if err != nil {
+		return nil, err
+	}
+	// 如果有ApiCode为FLXG54F5的子产品，改名为FLXG54F6
+	for _, resp := range combinedResult.Responses {
+		if resp.ApiCode == "FLXG54F5" {
+			resp.ApiCode = "FLXG54F5"
+		}
+	}
+	return json.Marshal(combinedResult)
 }

internal/domains/api/services/processors/comb/comb_service.go

@@ -32,7 +32,7 @@ func (cs *CombService) RegisterProcessor(apiCode string, processor processors.Pr
 }
 
 // ProcessCombRequest 处理组合包请求 - 实现 CombServiceInterface
-func (cs *CombService) ProcessCombRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies, packageCode string) ([]byte, error) {
+func (cs *CombService) ProcessCombRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies, packageCode string) (*processors.CombinedResult, error) {
 	// 1. 根据组合包code获取产品信息
 	packageProduct, err := cs.productManagementService.GetProductByCode(ctx, packageCode)
 	if err != nil {
@@ -66,8 +66,8 @@ func (cs *CombService) processSubProducts(
 	params []byte,
 	deps *processors.ProcessorDependencies,
 	packageItems []*entities.ProductPackageItem,
-) []*SubProductResult {
-	results := make([]*SubProductResult, 0, len(packageItems))
+) []*processors.SubProductResult {
+	results := make([]*processors.SubProductResult, 0, len(packageItems))
 	var wg sync.WaitGroup
 	var mu sync.Mutex
 
@@ -101,8 +101,8 @@ func (cs *CombService) processSingleSubProduct(
 	params []byte,
 	deps *processors.ProcessorDependencies,
 	item *entities.ProductPackageItem,
-) *SubProductResult {
-	result := &SubProductResult{
+) *processors.SubProductResult {
+	result := &processors.SubProductResult{
 		ApiCode:   item.Product.Code,
 		SortOrder: item.SortOrder,
 		Success:   false,
@@ -136,31 +136,12 @@ func (cs *CombService) processSingleSubProduct(
 }
 
 // combineResults 组合所有子产品的结果
-func (cs *CombService) combineResults(results []*SubProductResult) ([]byte, error) {
+func (cs *CombService) combineResults(results []*processors.SubProductResult) (*processors.CombinedResult, error) {
 	// 构建组合结果
-	combinedResult := &CombinedResult{
+	combinedResult := &processors.CombinedResult{
 		Responses: results,
 	}
-
-	// 序列化结果
-	respBytes, err := json.Marshal(combinedResult)
-	if err != nil {
-		return nil, fmt.Errorf("序列化组合结果失败: %s", err.Error())
-	}
-
-	return respBytes, nil
+	return combinedResult, nil
 }
 
-// SubProductResult 子产品处理结果
-type SubProductResult struct {
-	ApiCode   string      `json:"api_code"`   // 子接口标识
-	Data      interface{} `json:"data"`       // 子接口返回数据
-	Success   bool        `json:"success"`    // 是否成功
-	Error     string      `json:"error,omitempty"` // 错误信息（仅在失败时）
-	SortOrder int         `json:"-"`          // 排序字段，不输出到JSON
-}
 
-// CombinedResult 组合结果
-type CombinedResult struct {
-	Responses []*SubProductResult `json:"responses"` // 子接口响应列表
-}