update 0924

Author: wangzunjiao

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.15 - 2025-09-24
+- 新增isv模式 agent-token
+- 补充已知缺少参数
+
 ## 1.2.14 - 2025-07-09
 - update 0709
 

README.md

@@ -1,7 +1,7 @@
 ```
 Language：GO  
 GO version：1.22.5+  
-Tags：v1.2.14
+Tags：v1.2.15
 Copyright：Ant financial services group  
 ```
 

com/alipay/api/defaultAlipayClient.go

@@ -24,6 +24,7 @@ type DefaultAlipayClient struct {
 	ClientId           string
 	MerchantPrivateKey string
 	AlipayPublicKey    string
+	AgentToken         string
 	IsSandboxMode      bool
 }
 
@@ -33,20 +34,22 @@ type DefaultAlipayClient struct {
  * @param clientId 应用ID
  * @param merchantPrivateKey 商户私钥
  * @param alipayPublicKey 支付宝公钥
+ * @param agentTokenOpt 代理token
  */
-func NewDefaultAlipayClient(gatewayUrl string, clientId string, merchantPrivateKey string, alipayPublicKey string) *DefaultAlipayClient {
-	isSandboxMode := false
-	if strings.HasPrefix(clientId, "SANDBOX_") {
-		isSandboxMode = true
-	}
+func NewDefaultAlipayClient(gatewayUrl, clientId, merchantPrivateKey, alipayPublicKey string, agentTokenOpt ...string) *DefaultAlipayClient {
+	isSandboxMode := strings.HasPrefix(clientId, "SANDBOX_")
 
-	return &DefaultAlipayClient{
+	c := &DefaultAlipayClient{
 		GatewayUrl:         gatewayUrl,
 		ClientId:           clientId,
 		MerchantPrivateKey: merchantPrivateKey,
 		AlipayPublicKey:    alipayPublicKey,
 		IsSandboxMode:      isSandboxMode,
 	}
+	if len(agentTokenOpt) > 0 {
+		c.AgentToken = agentTokenOpt[0]
+	}
+	return c
 }
 
 // @Description 支持任意方式的http请求
@@ -127,7 +130,7 @@ func (alipayClient *DefaultAlipayClient) Execute(alipayRequest *request.AlipayRe
 	if err != nil {
 		return nil, err
 	}
-	header := buildBaseHeader(reqTime, alipayClient.ClientId, alipayRequest.KeyVersion, sign)
+	header := buildBaseHeader(reqTime, alipayClient.ClientId, alipayRequest.KeyVersion, sign, alipayClient.AgentToken)
 	alipayResponse, err := alipayClient.httpDo(alipayClient.GatewayUrl+path, httpMethod, map[string]string{}, header, reqPayload, alipayRequest.AlipayResponse)
 	if err != nil {
 		return nil, err
@@ -148,7 +151,7 @@ func checkRspSign(httpMethod string, path string, clientId string, responseTime
 	}
 }
 
-func buildBaseHeader(reqTime string, clientId string, keyVersion string, signatureValue string) map[string]string {
+func buildBaseHeader(reqTime string, clientId string, keyVersion string, signatureValue string, agentToken string) map[string]string {
 	if keyVersion == "" {
 		keyVersion = "1"
 	}
@@ -159,6 +162,8 @@ func buildBaseHeader(reqTime string, clientId string, keyVersion string, signatu
 		"Client-Id":    clientId,
 		"Key-Version":  keyVersion,
 		"Signature":    signatureValue,
+		"SDK-VERSION":  "global-open-sdk-go",
+		"agent-token":  agentToken,
 	}
 
 }

com/alipay/api/model/AcquirerInfo.go

@@ -5,6 +5,7 @@ type AcquirerInfo struct {
 	ReferenceRequestId    string `json:"referenceRequestId,omitempty"`
 	AcquirerTransactionId string `json:"acquirerTransactionId,omitempty"`
 	AcquirerMerchantId    string `json:"acquirerMerchantId,omitempty"`
+	AcquirerMerchantName  string `json:"acquirerMerchantName,omitempty"`
 	AcquirerResultCode    string `json:"acquirerResultCode,omitempty"`
 	AcquirerResultMessage string `json:"acquirerResultMessage,omitempty"`
 }

com/alipay/api/model/PaymentMethod.go

@@ -7,4 +7,15 @@ type PaymentMethod struct {
 	CustomerId                  string         `json:"customerId,omitempty"`
 	ExtendInfo                  string         `json:"extendInfo,omitempty"`
 	RequireIssuerAuthentication bool           `json:"requireIssuerAuthentication,omitempty"`
+	Funding                     FundingType    `json:"funding,omitempty"`
 }
+
+type FundingType string
+
+const (
+	FundingType_CREDIT         FundingType = "CREDIT"
+	FundingType_DEBIT          FundingType = "DEBIT"
+	FundingType_PREPAID        FundingType = "PREPAID"
+	FundingType_CHARGE         FundingType = "CHARGE"
+	FundingType_DEFERRED_DEBIT FundingType = "DEFERRED_DEBIT"
+)

com/alipay/api/model/PaymentMethodDetail.go

@@ -51,6 +51,18 @@ type CardPaymentMethodDetail struct {
 	PayerEmail                  string    `json:"payerEmail,omitempty"`
 	NetworkTransactionId        string    `json:"networkTransactionId,omitempty"`
 	Is3DSAuthentication         bool      `json:"is3DSAuthentication,omitempty"`
+	Request3DS                  string    `json:"request3DS,omitempty"`
+	ScaExemptionIndicator       string    `json:"scaExemptionIndicator,omitempty"`
+	EnableAuthenticationUpgrade string    `json:"enableAuthenticationUpgrade,omitempty"`
+	MpiData                     *MpiData  `json:"mpiData,omitempty"`
+}
+
+type MpiData struct {
+	ThreeDSVersion  string         `json:"threeDSVersion,omitempty"`
+	Eci             string         `json:"eci,omitempty"`
+	Cavv            string         `json:"cavv,omitempty"`
+	DsTransactionId string         `json:"dsTransactionId,omitempty"`
+	CredentialType  CredentialType `json:"credentialType,omitempty"`
 }
 
 type ExternalPaymentMethodDetail struct {
@@ -76,3 +88,10 @@ type CouponPaymentMethodDetail struct {
 	CouponExpireTime            string  `json:"couponExpireTime,omitempty"`
 	PaymentMethodDetailMetadata string  `json:"paymentMethodDetailMetadata,omitempty"`
 }
+
+type CredentialType string
+
+const (
+	CredentialType_NETWORK_TOKEN CredentialType = "NETWORK_TOKEN"
+	CredentialType_PAN           CredentialType = "PAN"
+)

com/alipay/api/model/PaymentResultInfo.go

@@ -17,12 +17,19 @@ type PaymentResultInfo struct {
 	LastFour             string        `json:"lastFour,omitempty"`
 	ExpiryMonth          string        `json:"expiryMonth,omitempty"`
 	ExpiryYear           string        `json:"expiryYear,omitempty"`
+	AccountNo            string        `json:"accountNo,omitempty"`
+	RefusalCodeRaw       string        `json:"refusalCodeRaw,omitempty"`
+	RefusalReasonRaw     string        `json:"refusalReasonRaw,omitempty"`
+	MerchantAdviceCode   string        `json:"merchantAdviceCode,omitempty"`
+	AcquirerInfo         AcquirerInfo  `json:"acquirerInfo,omitempty"`
 }
 
 type ThreeDSResult struct {
-	ThreeDSVersion  string `json:"threeDSVersion,omitempty"`
-	Eci             string `json:"eci,omitempty"`
-	Cavv            string `json:"cavv,omitempty"`
-	DsTransactionId string `json:"dsTransactionId,omitempty"`
-	Xid             string `json:"xid,omitempty"`
+	ThreeDSVersion                 string `json:"threeDSVersion,omitempty"`
+	Eci                            string `json:"eci,omitempty"`
+	Cavv                           string `json:"cavv,omitempty"`
+	DsTransactionId                string `json:"dsTransactionId,omitempty"`
+	Xid                            string `json:"xid,omitempty"`
+	ThreeDStransactionStatusReason string `json:"threeDStransactionStatusReason,omitempty"`
+	ChallengeCancel                string `json:"challengeCancel,omitempty"`
 }

com/alipay/api/request/pay/AlipayCaptureRequest.go

@@ -7,10 +7,12 @@ import (
 )
 
 type AlipayCaptureRequest struct {
-	CaptureRequestId string        `json:"captureRequestId,omitempty"`
-	PaymentId        string        `json:"paymentId,omitempty"`
-	CaptureAmount    *model.Amount `json:"captureAmount,omitempty"`
-	IsLastCapture    bool          `json:"isLastCapture,omitempty"`
+	CaptureRequestId string         `json:"captureRequestId,omitempty"`
+	PaymentId        string         `json:"paymentId,omitempty"`
+	CaptureAmount    *model.Amount  `json:"captureAmount,omitempty"`
+	IsLastCapture    bool           `json:"isLastCapture,omitempty"`
+	CaptureType      string         `json:"captureType,omitempty"`
+	Transit          *model.Transit `json:"transit,omitempty"`
 }
 
 func (alipayCaptureRequest *AlipayCaptureRequest) NewRequest() *request.AlipayRequest {

com/alipay/api/request/pay/AlipayPaymentSessionRequest.go

@@ -29,6 +29,7 @@ type AlipayPaymentSessionRequest struct {
 	AvailablePaymentMethod      *model.AvailablePaymentMethod `json:"availablePaymentMethod,omitempty"`
 	AllowedPaymentMethodRegions []string                      `json:"allowedPaymentMethodRegions,omitempty"`
 	SubscriptionInfo            *model.SubscriptionInfo       `json:"subscriptionInfo,omitempty"`
+	UserRegion                  string                        `json:"userRegion,omitempty"`
 }
 
 func (alipayPaymentSessionRequest *AlipayPaymentSessionRequest) NewRequest() *request.AlipayRequest {