From b0155546b3cc5259a878c3e4a2ca82431799f2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Fri, 24 Feb 2023 14:40:50 +0800 Subject: [PATCH] - update wechatpayopen --- library.go | 2 +- ...tner.transactions.id.transaction_id.get.go | 1 + .../pay.partner.transactions.native.post.go | 2 ++ ...ns.out-trade-no.out_trade_no.close.post.go | 1 + ...nsactions.out-trade-no.out_trade_no.get.go | 29 ++++++++++--------- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/library.go b/library.go index 8c666e4d..6924acbc 100644 --- a/library.go +++ b/library.go @@ -1,5 +1,5 @@ package go_library func Version() string { - return "1.0.88" + return "1.0.89" } diff --git a/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go b/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go index b26d9e7c..3d1d6973 100644 --- a/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go +++ b/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go @@ -54,6 +54,7 @@ func newPayPartnerTransactionsIdTransactionIdGetResult(result PayPartnerTransact func (c *Client) PayPartnerTransactionsIdTransactionIdGet(ctx context.Context, transactionId string, notMustParams ...gorequest.Params) *PayPartnerTransactionsIdTransactionIdGetResult { // 参数 params := gorequest.NewParamsWith(notMustParams...) + params.Set("sp_mchid", c.GetSpMchId()) // 服务商户号 params.Set("sub_mchid", c.GetSubMchId()) // 子商户号 // 请求 request, err := c.request(ctx, apiUrl+"/v3/pay/partner/transactions/id/"+transactionId, params, http.MethodGet) diff --git a/service/wechatpayopen/pay.partner.transactions.native.post.go b/service/wechatpayopen/pay.partner.transactions.native.post.go index 34c677ef..d1bb01b5 100644 --- a/service/wechatpayopen/pay.partner.transactions.native.post.go +++ b/service/wechatpayopen/pay.partner.transactions.native.post.go @@ -28,6 +28,8 @@ func newPayPartnerTransactionsNativePostResult(result PayPartnerTransactionsNati func (c *Client) PayPartnerTransactionsNativePost(ctx context.Context, notMustParams ...gorequest.Params) *PayPartnerTransactionsNativePostResult { // 参数 params := gorequest.NewParamsWith(notMustParams...) + params.Set("sp_appid", c.GetSpAppid()) // 服务商应用ID + params.Set("sp_mchid", c.GetSpMchId()) // 服务商户号 params.Set("sub_mchid", c.GetSubMchId()) // 子商户号 // 请求 request, err := c.request(ctx, apiUrl+"/v3/pay/partner/transactions/native", params, http.MethodPost) diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go index f33ff25d..6a5b6c1c 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go @@ -23,6 +23,7 @@ func newPayPartnerTransactionsOutTradeNoOutTradeNoClosePostResult(body []byte, h func (c *Client) PayPartnerTransactionsOutTradeNoOutTradeNoClosePost(ctx context.Context, outTradeNo string, notMustParams ...gorequest.Params) *PayPartnerTransactionsOutTradeNoOutTradeNoClosePostResult { // 参数 params := gorequest.NewParamsWith(notMustParams...) + params.Set("sp_mchid", c.GetSpMchId()) // 服务商户号 params.Set("sub_mchid", c.GetSubMchId()) // 子商户号 // 请求 request, err := c.request(ctx, apiUrl+"/v3/pay/partner/transactions/out-trade-no/"+outTradeNo+"/close", params, http.MethodPost) diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go index c5bf1fa3..07c590b8 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go @@ -8,7 +8,7 @@ import ( "time" ) -type PayPartnerOutTradeNoOutTradeNoGetResponse struct { +type PayPartnerTransactionsOutTradeNoOutTradeNoGetResponse struct { SpAppid string `json:"sp_appid"` // 服务商应用ID SpMchid string `json:"sp_mchid"` // 服务商户号 SubAppid string `json:"sub_appid"` // 子商户应用ID @@ -36,34 +36,35 @@ type PayPartnerOutTradeNoOutTradeNoGetResponse struct { } `json:"scene_info"` // 场景信息 } -type PayPartnerOutTradeNoOutTradeNoGetResult struct { - Result PayPartnerOutTradeNoOutTradeNoGetResponse // 结果 - Body []byte // 内容 - Http gorequest.Response // 请求 - Err error // 错误 - ApiError ApiError // 接口错误 +type PayPartnerTransactionsOutTradeNoOutTradeNoGetResult struct { + Result PayPartnerTransactionsOutTradeNoOutTradeNoGetResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 + ApiError ApiError // 接口错误 } -func newPayPartnerOutTradeNoOutTradeNoGetResult(result PayPartnerOutTradeNoOutTradeNoGetResponse, body []byte, http gorequest.Response, err error, apiError ApiError) *PayPartnerOutTradeNoOutTradeNoGetResult { - return &PayPartnerOutTradeNoOutTradeNoGetResult{Result: result, Body: body, Http: http, Err: err, ApiError: apiError} +func newPayPartnerTransactionsOutTradeNoOutTradeNoGetResult(result PayPartnerTransactionsOutTradeNoOutTradeNoGetResponse, body []byte, http gorequest.Response, err error, apiError ApiError) *PayPartnerTransactionsOutTradeNoOutTradeNoGetResult { + return &PayPartnerTransactionsOutTradeNoOutTradeNoGetResult{Result: result, Body: body, Http: http, Err: err, ApiError: apiError} } -// PayPartnerOutTradeNoOutTradeNoGet 商户订单号查询 +// PayPartnerTransactionsOutTradeNoOutTradeNoGet 商户订单号查询 // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_4_2.shtml -func (c *Client) PayPartnerOutTradeNoOutTradeNoGet(ctx context.Context, out_trade_no string, notMustParams ...gorequest.Params) *PayPartnerOutTradeNoOutTradeNoGetResult { +func (c *Client) PayPartnerTransactionsOutTradeNoOutTradeNoGet(ctx context.Context, out_trade_no string, notMustParams ...gorequest.Params) *PayPartnerTransactionsOutTradeNoOutTradeNoGetResult { // 参数 params := gorequest.NewParamsWith(notMustParams...) + params.Set("sp_mchid", c.GetSpMchId()) // 服务商户号 params.Set("sub_mchid", c.GetSubMchId()) // 子商户号 // 请求 request, err := c.request(ctx, apiUrl+"/v3/pay/partner/transactions/out-trade-no/"+out_trade_no, params, http.MethodGet) if err != nil { - return newPayPartnerOutTradeNoOutTradeNoGetResult(PayPartnerOutTradeNoOutTradeNoGetResponse{}, request.ResponseBody, request, err, ApiError{}) + return newPayPartnerTransactionsOutTradeNoOutTradeNoGetResult(PayPartnerTransactionsOutTradeNoOutTradeNoGetResponse{}, request.ResponseBody, request, err, ApiError{}) } // 定义 - var response PayPartnerOutTradeNoOutTradeNoGetResponse + var response PayPartnerTransactionsOutTradeNoOutTradeNoGetResponse err = json.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError err = json.Unmarshal(request.ResponseBody, &apiError) - return newPayPartnerOutTradeNoOutTradeNoGetResult(response, request.ResponseBody, request, err, apiError) + return newPayPartnerTransactionsOutTradeNoOutTradeNoGetResult(response, request.ResponseBody, request, err, apiError) }