diff --git a/cmd/api/__debug_bin.exe320353000 b/cmd/api/__debug_bin.exe320353000 deleted file mode 100644 index 2d755f5..0000000 Binary files a/cmd/api/__debug_bin.exe320353000 and /dev/null differ diff --git a/configs/env.development.yaml b/configs/env.development.yaml index 76f07bd..f6786fb 100644 --- a/configs/env.development.yaml +++ b/configs/env.development.yaml @@ -67,6 +67,8 @@ westdex: key: "121a1e41fc1690dd6b90afbcacd80cf4" secret_id: "449159" secret_second_id: "296804" +yushan: + url: https://api2.yushanshuju.com/credit-gw/service # =========================================== # 💰 支付宝支付配置 # =========================================== diff --git a/internal/application/product/product_application_service_impl.go b/internal/application/product/product_application_service_impl.go index 33ea40a..7034d75 100644 --- a/internal/application/product/product_application_service_impl.go +++ b/internal/application/product/product_application_service_impl.go @@ -965,7 +965,7 @@ func (s *ProductApplicationServiceImpl) getDTOMap() map[string]interface{} { "JRZQ0A03": &dto.JRZQ0A03Req{}, "JRZQ4AA8": &dto.JRZQ4AA8Req{}, "JRZQ8203": &dto.JRZQ8203Req{}, - "JRZQDBCE": &dto.JRZQDCBEReq{}, + "JRZQDCBE": &dto.JRZQDCBEReq{}, "QYGL2ACD": &dto.QYGL2ACDReq{}, "QYGL6F2D": &dto.QYGL6F2DReq{}, "QYGL45BD": &dto.QYGL45BDReq{}, diff --git a/internal/domains/api/dto/api_request_dto.go b/internal/domains/api/dto/api_request_dto.go index f5b7504..df13b0e 100644 --- a/internal/domains/api/dto/api_request_dto.go +++ b/internal/domains/api/dto/api_request_dto.go @@ -362,11 +362,11 @@ type YYSY4F2EReq struct { type YYSY9F1BReq struct { Name string `json:"name" validate:"required,min=1,validName"` - Phone string `json:"phone" validate:"required,min=11,max=11,validMobileNo"` + MobileNo string `json:"mobile_no" validate:"required,min=11,max=11,validMobileNo"` Authorized string `json:"authorized" validate:"required,oneof=0 1"` } type YYSY6F2BReq struct { - Phone string `json:"phone" validate:"required,min=11,max=11,validMobileNo"` + MobileNo string `json:"mobile_no" validate:"required,min=11,max=11,validMobileNo"` } type YYSY8B1CReq struct { @@ -436,15 +436,15 @@ type JRZQ0B6YReq struct { Name string `json:"name" validate:"required,min=1,validName"` IDCard string `json:"id_card" validate:"required,validIDCard"` MobileNo string `json:"mobile_no" validate:"required,min=11,max=11,validMobileNo"` - BankCard string `json:"bank_card" validate:"omitempty,validBankCard"` + BankCard string `json:"bank_card" validate:"required,validBankCard"` } // 银行卡鉴权 type JRZQ9A1WReq struct { Name string `json:"name" validate:"required,min=1,validName"` IDCard string `json:"id_card" validate:"required,validIDCard"` - MobileNo string `json:"mobile_no" validate:"required,min=11,max=11,validMobileNo"` - BankCard string `json:"bank_card" validate:"omitempty,validBankCard"` + MobileNo string `json:"mobile_no" validate:"omitempty,min=11,max=11,validMobileNo"` + BankCard string `json:"bank_card" validate:"required,validBankCard"` } // 企业管理董监高司法综合信息核验 diff --git a/internal/domains/api/services/processors/jrzq/jrzq0b6y_processor.go b/internal/domains/api/services/processors/jrzq/jrzq0b6y_processor.go index ddb56a7..59d9040 100644 --- a/internal/domains/api/services/processors/jrzq/jrzq0b6y_processor.go +++ b/internal/domains/api/services/processors/jrzq/jrzq0b6y_processor.go @@ -20,34 +20,11 @@ func ProcessJRZQ0B6YRequest(ctx context.Context, params []byte, deps *processors if err := deps.Validator.ValidateStruct(paramsDto); err != nil { return nil, errors.Join(processors.ErrInvalidParam, err) } - - encryptedName, err := deps.WestDexService.Encrypt(paramsDto.Name) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - - encryptedIDCard, err := deps.WestDexService.Encrypt(paramsDto.IDCard) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - - encryptedMobileNo, err := deps.WestDexService.Encrypt(paramsDto.MobileNo) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - - encryptedBankCard, err := deps.WestDexService.Encrypt(paramsDto.BankCard) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - reqData := map[string]interface{}{ - "data": map[string]interface{}{ - "name": encryptedName, - "cardId": encryptedBankCard, - "cardNo": encryptedIDCard, - "phone": encryptedMobileNo, - }, + "name": paramsDto.Name, + "cardld": paramsDto.BankCard, + "cardNo": paramsDto.IDCard, + "mobile": paramsDto.MobileNo, } respBytes, err := deps.YushanService.CallAPI(ctx, "FIN019", reqData) diff --git a/internal/domains/api/services/processors/jrzq/jrzq9a1w_processor.go b/internal/domains/api/services/processors/jrzq/jrzq9a1w_processor.go index abd5b9c..a53a249 100644 --- a/internal/domains/api/services/processors/jrzq/jrzq9a1w_processor.go +++ b/internal/domains/api/services/processors/jrzq/jrzq9a1w_processor.go @@ -20,34 +20,12 @@ func ProcessJRZQ9A1WRequest(ctx context.Context, params []byte, deps *processors if err := deps.Validator.ValidateStruct(paramsDto); err != nil { return nil, errors.Join(processors.ErrInvalidParam, err) } - encryptedName, err := deps.WestDexService.Encrypt(paramsDto.Name) - - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - - encryptedIDCard, err := deps.WestDexService.Encrypt(paramsDto.IDCard) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - - encryptedMobileNo, err := deps.WestDexService.Encrypt(paramsDto.MobileNo) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - - encryptedBankCard, err := deps.WestDexService.Encrypt(paramsDto.BankCard) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } reqData := map[string]interface{}{ - "data": map[string]interface{}{ - "name": encryptedName, - "cardId": encryptedBankCard, - "cardNo": encryptedIDCard, - "phone": encryptedMobileNo, - }, + "name": paramsDto.Name, + "cardId": paramsDto.BankCard, + "cardNo": paramsDto.IDCard, + "phone": paramsDto.MobileNo, } respBytes, err := deps.YushanService.CallAPI(ctx, "PCB145", reqData) diff --git a/internal/domains/api/services/processors/yysy/yysy6f2b_processor.go b/internal/domains/api/services/processors/yysy/yysy6f2b_processor.go index aeae52c..5003d4b 100644 --- a/internal/domains/api/services/processors/yysy/yysy6f2b_processor.go +++ b/internal/domains/api/services/processors/yysy/yysy6f2b_processor.go @@ -21,13 +21,13 @@ func ProcessYYSY6F2BRequest(ctx context.Context, params []byte, deps *processors return nil, errors.Join(processors.ErrInvalidParam, err) } - encryptedPhone, err := deps.ZhichaService.Encrypt(paramsDto.Phone) + encryptedMobileNo, err := deps.ZhichaService.Encrypt(paramsDto.MobileNo) if err != nil { return nil, errors.Join(processors.ErrSystem, err) } reqData := map[string]interface{}{ - "phone": encryptedPhone, + "phone": encryptedMobileNo, } respData, err := deps.ZhichaService.CallAPI(ctx, "ZCI041", reqData) diff --git a/internal/domains/api/services/processors/yysy/yysy9f1b_processor.go b/internal/domains/api/services/processors/yysy/yysy9f1b_processor.go index b289cc2..c8e4222 100644 --- a/internal/domains/api/services/processors/yysy/yysy9f1b_processor.go +++ b/internal/domains/api/services/processors/yysy/yysy9f1b_processor.go @@ -27,14 +27,14 @@ func ProcessYYSY9F1BYequest(ctx context.Context, params []byte, deps *processors return nil, errors.Join(processors.ErrSystem, err) } - encryptedPhone, err := deps.ZhichaService.Encrypt(paramsDto.Phone) + encryptedMobileNo, err := deps.ZhichaService.Encrypt(paramsDto.MobileNo) if err != nil { return nil, errors.Join(processors.ErrSystem, err) } reqData := map[string]interface{}{ "name": encryptedName, - "phone": encryptedPhone, + "phone": encryptedMobileNo, "authorized": paramsDto.Authorized, }