From c2628943725bc4a48330c60101c0db4b6cb69d29 Mon Sep 17 00:00:00 2001 From: 18278715334 <18278715334@163.com> Date: Mon, 5 Jan 2026 14:26:26 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=85=A8=E5=9B=BD=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=8F=B8=E6=B3=95=E6=A8=A1=E5=9E=8B=E6=9C=8D=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=5FV1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/container/container.go | 2 +- internal/domains/api/dto/api_request_dto.go | 11 +++- .../api/services/api_request_service.go | 1 + .../api/services/form_config_service.go | 1 + .../processors/flxg/flxg0v4b_processor.go | 2 +- .../processors/flxg/flxg8a3f_processor.go | 1 - .../processors/ivyz/ivyz9h2m_processor.go | 4 +- .../processors/qygl/qygl66sl_processor.go | 53 +++++++++++++++++++ .../processors/yysy/yysy4b21_processor.go | 2 +- .../processors/yysy/yysy6d9a_processor.go | 2 +- 10 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 internal/domains/api/services/processors/qygl/qygl66sl_processor.go diff --git a/internal/container/container.go b/internal/container/container.go index 7dc9fad..717919c 100644 --- a/internal/container/container.go +++ b/internal/container/container.go @@ -39,11 +39,11 @@ import ( infra_events "tyapi-server/internal/infrastructure/events" "tyapi-server/internal/infrastructure/external/alicloud" "tyapi-server/internal/infrastructure/external/email" + "tyapi-server/internal/infrastructure/external/jiguang" "tyapi-server/internal/infrastructure/external/muzi" "tyapi-server/internal/infrastructure/external/ocr" "tyapi-server/internal/infrastructure/external/sms" "tyapi-server/internal/infrastructure/external/storage" - "tyapi-server/internal/infrastructure/external/jiguang" "tyapi-server/internal/infrastructure/external/tianyancha" "tyapi-server/internal/infrastructure/external/westdex" "tyapi-server/internal/infrastructure/external/xingwei" diff --git a/internal/domains/api/dto/api_request_dto.go b/internal/domains/api/dto/api_request_dto.go index 06f3634..fcc96c6 100644 --- a/internal/domains/api/dto/api_request_dto.go +++ b/internal/domains/api/dto/api_request_dto.go @@ -636,6 +636,13 @@ type QYGL2S0WReq struct { EntCode string `json:"ent_code" validate:"omitempty,validUSCI"` } +// 全国企业司法模型服务查询_V1 +type QYGL66SLReq struct { + EntCode string `json:"ent_code" validate:"omitempty,validUSCI"` + AuthDate string `json:"auth_date" validate:"required,validAuthDate"` + EntName string `json:"ent_name" validate:"omitempty,min=1,validEnterpriseName"` + AuthAuthorizeFileCode string `json:"auth_authorize_file_code" validate:"required"` +} type JRZQ2F8AReq struct { Name string `json:"name" validate:"required,min=1,validName"` MobileNo string `json:"mobile_no" validate:"required,min=11,max=11,validMobileNo"` @@ -724,8 +731,8 @@ type IVYZ6M8PReq struct { } type IVYZ9H2MReq struct { - IDNo string `json:"id_no" validate:"required,validIDCard"` - Name string `json:"name" validate:"required,min=1,validName"` + IDCard string `json:"id_no" validate:"required,validIDCard"` + Name string `json:"name" validate:"required,min=1,validName"` } type YYSY9E4AReq struct { diff --git a/internal/domains/api/services/api_request_service.go b/internal/domains/api/services/api_request_service.go index 9b6b44c..5064da2 100644 --- a/internal/domains/api/services/api_request_service.go +++ b/internal/domains/api/services/api_request_service.go @@ -159,6 +159,7 @@ func registerAllProcessors(combService *comb.CombService) { "QYGL5A9T": qygl.ProcessQYGL5A9TRequest, //全国企业各类工商风险统计数量查询 "QYGL2S0W": qygl.ProcessQYGL2S0WRequest, //失信被执行企业个人查询 "QYGL5CMP": qygl.ProcessQYGL5CMPRequest, //企业五要素验证 + "QYGL66SL": qygl.ProcessQYGL66SLRequest, //全国企业司法模型服务查询_V1 // YYSY系列处理器 "YYSYD50F": yysy.ProcessYYSYD50FRequest, diff --git a/internal/domains/api/services/form_config_service.go b/internal/domains/api/services/form_config_service.go index 2100677..5abbb76 100644 --- a/internal/domains/api/services/form_config_service.go +++ b/internal/domains/api/services/form_config_service.go @@ -204,6 +204,7 @@ func (s *FormConfigServiceImpl) getDTOStruct(ctx context.Context, apiCode string "IVYZZQT3": &dto.IVYZZQT3Req{}, //人脸比对V3 "IVYZBPQ2": &dto.IVYZBPQ2Req{}, //人脸比对V2 "IVYZSFEL": &dto.IVYZSFELReq{}, //全国自然人人像三要素核验_V1 + "QYGL66SL": &dto.QYGL66SLReq{}, //全国企业司法模型服务查询_V1 } // 优先返回已配置的DTO diff --git a/internal/domains/api/services/processors/flxg/flxg0v4b_processor.go b/internal/domains/api/services/processors/flxg/flxg0v4b_processor.go index c3469dc..7bb0720 100644 --- a/internal/domains/api/services/processors/flxg/flxg0v4b_processor.go +++ b/internal/domains/api/services/processors/flxg/flxg0v4b_processor.go @@ -24,7 +24,7 @@ func ProcessFLXG0V4BRequest(ctx context.Context, params []byte, deps *processors if err := deps.Validator.ValidateStruct(paramsDto); err != nil { return nil, errors.Join(processors.ErrInvalidParam, err) } - if paramsDto.IDCard == "350681198611130611" || paramsDto.IDCard == "622301200006250550" { + if paramsDto.IDCard == "350681198611130611" || paramsDto.IDCard == "622301200006250550" { return nil, errors.Join(processors.ErrNotFound, errors.New("查询为空")) } encryptedName, err := deps.WestDexService.Encrypt(paramsDto.Name) diff --git a/internal/domains/api/services/processors/flxg/flxg8a3f_processor.go b/internal/domains/api/services/processors/flxg/flxg8a3f_processor.go index 23644fd..662be06 100644 --- a/internal/domains/api/services/processors/flxg/flxg8a3f_processor.go +++ b/internal/domains/api/services/processors/flxg/flxg8a3f_processor.go @@ -5,7 +5,6 @@ import ( "encoding/json" "errors" "fmt" - "tyapi-server/internal/domains/api/dto" "tyapi-server/internal/domains/api/services/processors" "tyapi-server/internal/infrastructure/external/westdex" diff --git a/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go b/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go index dfc7638..179a363 100644 --- a/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go +++ b/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go @@ -23,8 +23,8 @@ func ProcessIVYZ9H2MRequest(ctx context.Context, params []byte, deps *processors // 构建请求参数 reqData := map[string]interface{}{ - "idNo": paramsDto.IDNo, - "name": paramsDto.Name, + "idCard": paramsDto.IDCard, + "name": paramsDto.Name, } // 调用极光API，apiCode为 marriage-single-v2 diff --git a/internal/domains/api/services/processors/qygl/qygl66sl_processor.go b/internal/domains/api/services/processors/qygl/qygl66sl_processor.go new file mode 100644 index 0000000..47e7417 --- /dev/null +++ b/internal/domains/api/services/processors/qygl/qygl66sl_processor.go @@ -0,0 +1,53 @@ +package qygl + +import ( + "context" + "encoding/json" + "errors" + + "tyapi-server/internal/domains/api/dto" + "tyapi-server/internal/domains/api/services/processors" + "tyapi-server/internal/infrastructure/external/xingwei" +) + +// Processqygl66slRequest QYGL66SL API处理方法 - 全国企业司法模型服务查询_V1 +func ProcessQYGL66SLRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) { + + var paramsDto dto.QYGL66SLReq + if err := json.Unmarshal(params, ¶msDto); err != nil { + return nil, errors.Join(processors.ErrSystem, err) + } + + if err := deps.Validator.ValidateStruct(paramsDto); err != nil { + return nil, errors.Join(processors.ErrInvalidParam, err) + } + + // 构建请求数据， + reqData := map[string]interface{}{ + "orgName": paramsDto.EntName, + "inquiredAuth": "authed:" + paramsDto.AuthDate, + "uscc": paramsDto.EntCode, + "authAuthorizeFileCode": paramsDto.AuthAuthorizeFileCode, + } + + // 调用行为数据API，使用指定的project_id + projectID := "CDJ-1068350101956521984" + respBytes, err := deps.XingweiService.CallAPI(ctx, projectID, reqData) + if err != nil { + if errors.Is(err, xingwei.ErrNotFound) { + // 查空情况，返回特定的查空错误 + return nil, errors.Join(processors.ErrNotFound, err) + } else if errors.Is(err, xingwei.ErrDatasource) { + // 数据源错误 + return nil, errors.Join(processors.ErrDatasource, err) + } else if errors.Is(err, xingwei.ErrSystem) { + // 系统错误 + return nil, errors.Join(processors.ErrSystem, err) + } else { + // 其他未知错误 + return nil, errors.Join(processors.ErrSystem, err) + } + } + + return respBytes, nil +} diff --git a/internal/domains/api/services/processors/yysy/yysy4b21_processor.go b/internal/domains/api/services/processors/yysy/yysy4b21_processor.go index 3008840..781816f 100644 --- a/internal/domains/api/services/processors/yysy/yysy4b21_processor.go +++ b/internal/domains/api/services/processors/yysy/yysy4b21_processor.go @@ -42,4 +42,4 @@ func ProcessYYSY4B21Request(ctx context.Context, params []byte, deps *processors } return respBytes, nil -} \ No newline at end of file +} diff --git a/internal/domains/api/services/processors/yysy/yysy6d9a_processor.go b/internal/domains/api/services/processors/yysy/yysy6d9a_processor.go index 683ab67..2de31c4 100644 --- a/internal/domains/api/services/processors/yysy/yysy6d9a_processor.go +++ b/internal/domains/api/services/processors/yysy/yysy6d9a_processor.go @@ -27,7 +27,7 @@ func ProcessYYSY6D9ARequest(ctx context.Context, params []byte, deps *processors } reqData := map[string]interface{}{ - "phone": encryptedMobileNo, + "phone": encryptedMobileNo, } respData, err := deps.ZhichaService.CallAPI(ctx, "ZCI030", reqData)