From a79d9ddec2f77ac88a9499b4e4118a387aba7f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 14 Aug 2025 10:13:30 +0800 Subject: [PATCH] 1 --- platformapi/lakala/lakala_incoming.go | 10 ++++++++-- platformapi/lakala/lakala_incoming_model.go | 2 +- platformapi/lakala/lakala_token_test.go | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/platformapi/lakala/lakala_incoming.go b/platformapi/lakala/lakala_incoming.go index 294119f0..7a2a7598 100644 --- a/platformapi/lakala/lakala_incoming.go +++ b/platformapi/lakala/lakala_incoming.go @@ -335,12 +335,18 @@ func (a *API) GetMerchantReportStatus(orgCode, agentNo, externalCustomerNo strin return nil, err } - if imgSupplementResp.Code != "200" { + if imgSupplementResp.Code != Success { return nil, fmt.Errorf(imgSupplementResp.Message) } + base64DecryData, _ := base64.StdEncoding.DecodeString(imgSupplementResp.Data) + resultData, err := DecryptByPublicKey(base64DecryData, PublicKeyBegin) + if err != nil { + return nil, err + } + openUnionpayMerchantVo := &OpenUnionpayMerchantVo{} - if err = json.Unmarshal([]byte(imgSupplementResp.Data), openUnionpayMerchantVo); err != nil { + if err = json.Unmarshal(resultData, openUnionpayMerchantVo); err != nil { return nil, err } diff --git a/platformapi/lakala/lakala_incoming_model.go b/platformapi/lakala/lakala_incoming_model.go index d23425a7..ad94834e 100644 --- a/platformapi/lakala/lakala_incoming_model.go +++ b/platformapi/lakala/lakala_incoming_model.go @@ -612,7 +612,7 @@ type ImgSupplementReq struct { // OpenUnionpayMerchantVo 银联报备,商户报备查询 type OpenUnionpayMerchantVo struct { - AgentNo int `json:"agentNo"` // 机构号 + AgentNo string `json:"agentNo"` // 机构号 OrgCode string `json:"orgCode"` // 代理商编号 ExternalCustomerNo string `json:"externalCustomerNo"` // 商户编号 CustomerName string `json:"customerName"` // 商户名称 diff --git a/platformapi/lakala/lakala_token_test.go b/platformapi/lakala/lakala_token_test.go index 4045bbbc..41f04cd6 100644 --- a/platformapi/lakala/lakala_token_test.go +++ b/platformapi/lakala/lakala_token_test.go @@ -227,7 +227,7 @@ func TestCheckImgIsSupplement(t *testing.T) { // TestGetMerchantReportStatus 商户报备查询 func TestGetMerchantReportStatus(t *testing.T) { - api.GetMerchantReportStatus("983931", "24354409", "822651059990E0M") + api.GetMerchantReportStatus("983931", "24354409", "822651059990E2S") } // TestGetMerchantTerminal 设备终端报备查询