team/tyapi-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f

Browse Source
This commit is contained in:
Mrx
2026-01-24 12:28:49 +08:00
parent 21d312f143
commit 1cfd4bf0d0
2 changed files with 73 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
internal/domains/api/services/processors/yysy/yysy09cd_processor.go
View File

@@ -8,35 +8,36 @@ import (
"tyapi-server/internal/domains/api/dto" "tyapi-server/internal/domains/api/dto"
"tyapi-server/internal/domains/api/services/processors" "tyapi-server/internal/domains/api/services/processors"
"tyapi-server/internal/infrastructure/external/xingwei" "tyapi-server/internal/infrastructure/external/shumai"
) )
// XingweiResponseData 星维数据源返回的数据结构 // shumaiMobileThreeResp 数脉 /v4/mobile_three/check 返回的 data 结构
type XingweiResponseData struct { // result: 0-一致 1-不一致 2-无记录；channel: cmcc/cucc/ctcc/gdcc
OrderNo string `json:"orderNo"` type shumaiMobileThreeResp struct {
HandleTime string `json:"handleTime"` OrderNo string `json:"order_no"`
Type string `json:"type"`
Result string `json:"result"` Result string `json:"result"`
Gender string `json:"gender"` Desc string `json:"desc"`
Age string `json:"age"` Channel string `json:"channel"`
Remark string `json:"remark"` Sex string `json:"sex"`
Birthday string `json:"birthday"`
Address string `json:"address"`
} }
// YYSY09CDResponse 原来的返回结构 // YYSY09CDResponse 最终返回结构
// code: 1000一致 1001不一致 1002查无
type YYSY09CDResponse struct { type YYSY09CDResponse struct {
Code string `json:"code"` Code string `json:"code"`
Data YYSY09CDResponseData `json:"data"` Data YYSY09CDResponseData `json:"data"`
} }
// YYSY09CDResponseData 原来的返回数据结构
type YYSY09CDResponseData struct { type YYSY09CDResponseData struct {
Msg string `json:"msg"` Msg string `json:"msg"` // 一致/不一致/查无
PhoneType string `json:"phoneType"` PhoneType string `json:"phoneType"` // CMCC/CUCC/CTCC/CBN
Code int `json:"code"` Code int `json:"code"` // 1000/1001/1002
EncryptType string `json:"encryptType"` EncryptType string `json:"encryptType"` // MD5
} }
// ProcessYYSY09CDRequest YYSY09CD API处理方法 // ProcessYYSY09CDRequest YYSY09CD API处理方法 - 运营商三要素查询
func ProcessYYSY09CDRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) { func ProcessYYSY09CDRequest(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) {
var paramsDto dto.YYSY09CDReq var paramsDto dto.YYSY09CDReq
if err := json.Unmarshal(params, &paramsDto); err != nil { if err := json.Unmarshal(params, &paramsDto); err != nil {
@@ -46,99 +47,84 @@ func ProcessYYSY09CDRequest(ctx context.Context, params []byte, deps *processors
if err := deps.Validator.ValidateStruct(paramsDto); err != nil { if err := deps.Validator.ValidateStruct(paramsDto); err != nil {
return nil, errors.Join(processors.ErrInvalidParam, err) return nil, errors.Join(processors.ErrInvalidParam, err)
} }
reqFormData := map[string]interface{}{
// 构建请求数据，将项目规范的字段名转换为 XingweiService 需要的字段名 "idcard": paramsDto.IDCard,
reqData := map[string]interface{}{
"name": paramsDto.Name, "name": paramsDto.Name,
"idCardNum": paramsDto.IDCard, "mobile": paramsDto.MobileNo,
"phoneNumber": paramsDto.MobileNo,
} }
// 调用行为数据API，使用指定的project_id deps.ShumaiService.UseGovernment()
projectID := "CDJ-1100244697766359040" apiPath := "/v4/mobile_three/check"
respBytes, err := deps.XingweiService.CallAPI(ctx, projectID, reqData) respBytes, err := deps.ShumaiService.CallAPIForm(ctx, apiPath, reqFormData)
if err != nil { if err != nil {
if errors.Is(err, xingwei.ErrNotFound) { if errors.Is(err, shumai.ErrDatasource) {
return nil, errors.Join(processors.ErrNotFound, err)
} else if errors.Is(err, xingwei.ErrDatasource) {
return nil, errors.Join(processors.ErrDatasource, err) return nil, errors.Join(processors.ErrDatasource, err)
} else if errors.Is(err, xingwei.ErrSystem) { } else if errors.Is(err, shumai.ErrSystem) {
return nil, errors.Join(processors.ErrSystem, err) return nil, errors.Join(processors.ErrSystem, err)
} else { } else {
return nil, errors.Join(processors.ErrSystem, err) return nil, errors.Join(processors.ErrSystem, err)
} }
} }
// 解析星维返回的数据 out, err := mapShumaiMobileThreeToYYSY09CD(respBytes)
var xingweiData XingweiResponseData
if err := json.Unmarshal(respBytes, &xingweiData); err != nil {
return nil, errors.Join(processors.ErrSystem, err)
}
// 转换为原来的格式
response := convertToOriginalFormat(xingweiData, paramsDto.MobileType)
// 序列化为JSON
resultBytes, err := json.Marshal(response)
if err != nil { if err != nil {
return nil, errors.Join(processors.ErrSystem, err) return nil, errors.Join(processors.ErrSystem, err)
} }
return json.Marshal(out)
return resultBytes, nil
} }
// convertToOriginalFormat 将星维数据源返回的数据转换为原来的格式 // mapShumaiMobileThreeToYYSY09CD 数脉 mobile_three/check 的 data -> 最终格式
func convertToOriginalFormat(xingweiData XingweiResponseData, mobileType string) YYSY09CDResponse { // result: 0->1000一致 1->1001不一致 2->1002查无 其它->1002查无；channel: cmcc->CMCC cucc->CUCC ctcc->CTCC gdcc->CBN
// 转换 result 到 code func mapShumaiMobileThreeToYYSY09CD(dataBytes []byte) (*YYSY09CDResponse, error) {
var code string var r shumaiMobileThreeResp
if err := json.Unmarshal(dataBytes, &r); err != nil {
return nil, err
}
// code/msg: 1000一致 1001不一致 1002查无
var codeStr string
var codeInt int var codeInt int
switch xingweiData.Result { var msg string
case "01": // 一致 switch strings.TrimSpace(r.Result) {
code = "1000" case "0":
codeStr = "1000"
codeInt = 1000 codeInt = 1000
case "02": // 不一致 msg = "一致"
code = "1001" case "1":
codeStr = "1001"
codeInt = 1001 codeInt = 1001
case "03", "04": // 不确定或失败/虚拟号 -> 查无 msg = "不一致"
code = "1002" case "2":
codeStr = "1002"
codeInt = 1002 codeInt = 1002
msg = "查无"
default: default:
// 默认查无 codeStr = "1002"
code = "1002"
codeInt = 1002 codeInt = 1002
msg = "查无"
} }
// 从 remark 提取 msg，去掉"认证"前缀 // phoneType: cmcc->CMCC cucc->CUCC ctcc->CTCC gdcc->CBN(广电)
msg := xingweiData.Remark ch := strings.ToLower(strings.TrimSpace(r.Channel))
if strings.HasPrefix(msg, "认证") { var phoneType string
msg = strings.TrimPrefix(msg, "认证") switch ch {
} case "cmcc":
// 转换 type 到 phoneType
// 如果请求参数中有 mobileType，优先使用；否则从返回的 type 转换
phoneType := mobileType
if phoneType == "" {
switch xingweiData.Type {
case "1": // 移动
phoneType = "CMCC" phoneType = "CMCC"
case "2": // 联通 case "cucc":
phoneType = "CUCC" phoneType = "CUCC"
case "3": // 电信 case "ctcc":
phoneType = "CTCC" phoneType = "CTCC"
case "4": // 广电 case "gdcc":
phoneType = "CBN" phoneType = "CBN"
default:
phoneType = ""
}
} }
return YYSY09CDResponse{ return &YYSY09CDResponse{
Code: code, Code: codeStr,
Data: YYSY09CDResponseData{ Data: YYSY09CDResponseData{
Msg: msg, Msg: msg,
PhoneType: phoneType, PhoneType: phoneType,
Code: codeInt, Code: codeInt,
EncryptType: "MD5", EncryptType: "MD5",
}, },
} }, nil
} }

12
internal/domains/api/services/processors/yysy/yysy9a1b_processor.go
View File

@@ -13,18 +13,6 @@ import (
"tyapi-server/internal/infrastructure/external/shumai" "tyapi-server/internal/infrastructure/external/shumai"
) )
// shumaiMobileThreeResp 数脉 /v4/mobile_three/check 返回的 data 结构
// result: 0-一致收费 1-不一致收费 2-无记录不收费
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 最终返回格式 // yysy9a1bOut 最终返回格式
// result: 01一致 02不一致 03不确定 04失败/虚拟号；type: 1移动 2联通 3电信 4广电 // result: 01一致 02不一致 03不确定 04失败/虚拟号；type: 1移动 2联通 3电信 4广电
type yysy9a1bOut struct { type yysy9a1bOut struct {