From b3a7ace24332adb7bf26c2612c251ba1ee93be31 Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Sat, 2 Aug 2025 03:16:20 +0800 Subject: [PATCH] fix --- .../processors/comb/comb86pm_processor.go | 2 +- .../processors/flxg/flxg0v3b_processor.go | 30 ++++++++----------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/internal/domains/api/services/processors/comb/comb86pm_processor.go b/internal/domains/api/services/processors/comb/comb86pm_processor.go index fa4531f..97b0530 100644 --- a/internal/domains/api/services/processors/comb/comb86pm_processor.go +++ b/internal/domains/api/services/processors/comb/comb86pm_processor.go @@ -28,7 +28,7 @@ func ProcessCOMB86PMRequest(ctx context.Context, params []byte, deps *processors } // 如果有ApiCode为FLXG54F5的子产品,改名为FLXG54F6 for _, resp := range combinedResult.Responses { - if resp.ApiCode == "FLXG54F5" { + if resp.ApiCode == "FLXGBC21" { resp.ApiCode = "FLXG54F5" } } diff --git a/internal/domains/api/services/processors/flxg/flxg0v3b_processor.go b/internal/domains/api/services/processors/flxg/flxg0v3b_processor.go index e5b95f3..53166a6 100644 --- a/internal/domains/api/services/processors/flxg/flxg0v3b_processor.go +++ b/internal/domains/api/services/processors/flxg/flxg0v3b_processor.go @@ -3,11 +3,12 @@ package flxg import ( "context" "encoding/json" + "errors" "fmt" - "time" "tyapi-server/internal/domains/api/dto" "tyapi-server/internal/domains/api/services/processors" + "tyapi-server/internal/infrastructure/external/westdex" ) // ProcessFLXG0V3Bequest FLXG0V3B API处理方法 @@ -31,27 +32,20 @@ func ProcessFLXG0V3Bequest(ctx context.Context, params []byte, deps *processors. return nil, fmt.Errorf("%s: %w", processors.ErrSystem, err) } - // mock 1秒,不用真实请求 - // 模拟耗时 - select { - case <-ctx.Done(): - return nil, ctx.Err() - case <-time.After(1 * time.Second): - } - - // 构造模拟响应 - mockResp := map[string]interface{}{ - "code": 0, - "msg": "mock success", + reqData := map[string]interface{}{ "data": map[string]interface{}{ - "name": encryptedName, - "id_card": encryptedIDCard, - "result": "mocked", + "name": encryptedName, + "id_card": encryptedIDCard, }, } - respBytes, err := json.Marshal(mockResp) + + respBytes, err := deps.WestDexService.CallAPI("G34BJ03", reqData) if err != nil { - return nil, fmt.Errorf("%s: %w", processors.ErrSystem, err) + if errors.Is(err, westdex.ErrDatasource) { + return nil, fmt.Errorf("%s: %w", processors.ErrDatasource, err) + } else { + return nil, fmt.Errorf("%s: %w", processors.ErrSystem, err) + } } return respBytes, nil