diff --git a/internal/domains/api/services/processors/yysy/yysy09cd_processor.go b/internal/domains/api/services/processors/yysy/yysy09cd_processor.go index 03aa667..ee0a8a4 100644 --- a/internal/domains/api/services/processors/yysy/yysy09cd_processor.go +++ b/internal/domains/api/services/processors/yysy/yysy09cd_processor.go @@ -8,21 +8,9 @@ import ( "tyapi-server/internal/domains/api/dto" "tyapi-server/internal/domains/api/services/processors" - "tyapi-server/internal/infrastructure/external/shumai" + "tyapi-server/internal/infrastructure/external/shujubao" ) -// shumaiMobileThreeResp 数脉 /v4/mobile_three/check 返回的 data 结构 -// result: 0-一致 1-不一致 2-无记录;channel: cmcc/cucc/ctcc/gdcc -type shumaiMobileThreeResp struct { - OrderNo string `json:"order_no"` - Result string `json:"result"` - Desc string `json:"desc"` - Channel string `json:"channel"` - Sex string `json:"sex"` - Birthday string `json:"birthday"` - Address string `json:"address"` -} - // YYSY09CDResponse 最终返回结构 // code: 1000一致 1001不一致 1002查无 type YYSY09CDResponse struct { @@ -47,43 +35,48 @@ func ProcessYYSY09CDRequest(ctx context.Context, params []byte, deps *processors if err := deps.Validator.ValidateStruct(paramsDto); err != nil { return nil, errors.Join(processors.ErrInvalidParam, err) } - reqFormData := map[string]interface{}{ - "idcard": paramsDto.IDCard, + reqParams := map[string]interface{}{ + "key": "c115708d915451da8f34a23e144dda6b", "name": paramsDto.Name, + "idcard": paramsDto.IDCard, "mobile": paramsDto.MobileNo, } - apiPath := "/v4/mobile_three/check" - - // 先尝试使用政务接口(app_id2 和 app_secret2) - respBytes, err := deps.ShumaiService.CallAPIForm(ctx, apiPath, reqFormData, true) + apiPath := "/communication/personal/1979" + data, err := deps.ShujubaoService.CallAPI(ctx, apiPath, reqParams) if err != nil { - // 使用实时接口(app_id 和 app_secret)重试 - respBytes, err = deps.ShumaiService.CallAPIForm(ctx, apiPath, reqFormData, false) - // 如果重试后仍然失败,返回错误 - if err != nil { - if errors.Is(err, shumai.ErrDatasource) { - return nil, errors.Join(processors.ErrDatasource, err) - } else if errors.Is(err, shumai.ErrSystem) { - return nil, errors.Join(processors.ErrSystem, err) - } else { - return nil, errors.Join(processors.ErrSystem, err) - } + if errors.Is(err, shujubao.ErrDatasource) { + return nil, errors.Join(processors.ErrDatasource, err) } + if errors.Is(err, shujubao.ErrQueryEmpty) { + return nil, errors.Join(processors.ErrNotFound, err) + } + return nil, errors.Join(processors.ErrSystem, err) } - out, err := mapShumaiMobileThreeToYYSY09CD(respBytes) + out, err := mapYYSYK9R4ToYYSY09CD(data) if err != nil { return nil, errors.Join(processors.ErrSystem, err) } return json.Marshal(out) } -// mapShumaiMobileThreeToYYSY09CD 数脉 mobile_three/check 的 data -> 最终格式 -// result: 0->1000一致 1->1001不一致 2->1002查无 其它->1002查无;channel: cmcc->CMCC cucc->CUCC ctcc->CTCC gdcc->CBN -func mapShumaiMobileThreeToYYSY09CD(dataBytes []byte) (*YYSY09CDResponse, error) { - var r shumaiMobileThreeResp - if err := json.Unmarshal(dataBytes, &r); err != nil { +// yysyk9r4Resp 数据宝 YYSYK9R4 接口 data 结构 +// state: 1-验证一致 2-验证不一致 3-异常情况 +type yysyk9r4Resp struct { + State string `json:"state"` +} + +// mapYYSYK9R4ToYYSY09CD 数据宝 YYSYK9R4 的 data -> YYSY09CD 最终格式 +// state: 1->1000一致 2->1001不一致 其它->1002查无 +func mapYYSYK9R4ToYYSY09CD(data interface{}) (*YYSY09CDResponse, error) { + var r yysyk9r4Resp + + b, err := json.Marshal(data) + if err != nil { + return nil, err + } + if err := json.Unmarshal(b, &r); err != nil { return nil, err } @@ -91,44 +84,26 @@ func mapShumaiMobileThreeToYYSY09CD(dataBytes []byte) (*YYSY09CDResponse, error) var codeStr string var codeInt int var msg string - switch strings.TrimSpace(r.Result) { - case "0": + switch strings.TrimSpace(r.State) { + case "1": codeStr = "1000" codeInt = 1000 msg = "一致" - case "1": + case "2": codeStr = "1001" codeInt = 1001 msg = "不一致" - case "2": - codeStr = "1002" - codeInt = 1002 - msg = "查无" default: codeStr = "1002" codeInt = 1002 msg = "查无" } - // phoneType: cmcc->CMCC cucc->CUCC ctcc->CTCC gdcc->CBN(广电) - ch := strings.ToLower(strings.TrimSpace(r.Channel)) - var phoneType string - switch ch { - case "cmcc": - phoneType = "CMCC" - case "cucc": - phoneType = "CUCC" - case "ctcc": - phoneType = "CTCC" - case "gdcc": - phoneType = "CBN" - } - return &YYSY09CDResponse{ Code: codeStr, Data: YYSY09CDResponseData{ Msg: msg, - PhoneType: phoneType, + PhoneType: "", Code: codeInt, EncryptType: "MD5", }, diff --git a/internal/domains/api/services/processors/yysy/yysy9a1b_processor.go b/internal/domains/api/services/processors/yysy/yysy9a1b_processor.go index b4fcd52..0f879fa 100644 --- a/internal/domains/api/services/processors/yysy/yysy9a1b_processor.go +++ b/internal/domains/api/services/processors/yysy/yysy9a1b_processor.go @@ -13,6 +13,18 @@ import ( "tyapi-server/internal/infrastructure/external/shumai" ) +// shumaiMobileThreeResp 数脉 /v4/mobile_three/check 返回的 data 结构 +// result: 0-一致 1-不一致 2-无记录;channel: cmcc/cucc/ctcc/gdcc +type shumaiMobileThreeResp struct { + OrderNo string `json:"order_no"` + Result string `json:"result"` + Desc string `json:"desc"` + Channel string `json:"channel"` + Sex string `json:"sex"` + Birthday string `json:"birthday"` + Address string `json:"address"` +} + // yysy9a1bOut 最终返回格式 // result: 01一致 02不一致 03不确定 04失败/虚拟号;type: 1移动 2联通 3电信 4广电 type yysy9a1bOut struct {