v1.5.65

iGoogle-ink · iGoogle-ink · commit 3f25b445a3db · 2021-12-08T23:15:25.000+08:00
diff --git a/alipay/client.go b/alipay/client.go
@@ -114,7 +114,7 @@ func (a *Client) RequestParam(bm gopay.BodyMap, method string) (string, error) {
 	if bm.GetString("sign") == "" {
 		sign, err = GetRsaSign(bm, bm.GetString("sign_type"), a.privateKey)
 		if err != nil {
-			return "", fmt.Errorf("GetRsaSign Error: %v", err)
+			return "", fmt.Errorf("GetRsaSign Error: %w", err)
 		}
 		bm.Set("sign", sign)
 	}
@@ -162,7 +162,7 @@ func (a *Client) doAliPaySelf(ctx context.Context, bm gopay.BodyMap, method stri
 	if bm.GetString("sign") == "" {
 		sign, err = GetRsaSign(bm, bm.GetString("sign_type"), a.privateKey)
 		if err != nil {
-			return nil, fmt.Errorf("GetRsaSign Error: %v", err)
+			return nil, fmt.Errorf("GetRsaSign Error: %w", err)
 		}
 		bm.Set("sign", sign)
 	}
@@ -243,7 +243,7 @@ func (a *Client) doAliPay(ctx context.Context, bm gopay.BodyMap, method string,
 	}
 	sign, err := GetRsaSign(pubBody, pubBody.GetString("sign_type"), a.privateKey)
 	if err != nil {
-		return nil, fmt.Errorf("GetRsaSign Error: %v", err)
+		return nil, fmt.Errorf("GetRsaSign Error: %w", err)
 	}
 	pubBody.Set("sign", sign)
 	if a.DebugSwitch == gopay.DebugOn {
diff --git a/body_map_test.go b/body_map_test.go
@@ -131,3 +131,16 @@ func TestBodyMapMarshalSlice(t *testing.T) {
 	bss, _ := xml.Marshal(bm)
 	xlog.Debug("body:", string(bss))
 }
+
+func TestSliceTest(t *testing.T) {
+	var rs []string
+	rs = append(rs, "SOFTWARE")
+	rs = append(rs, "SECURITY")
+	rs = append(rs, "LOVE_MARRIAGE")
+
+	bm := make(BodyMap)
+	bm.Set("sub_mchid", "2021060717").
+		Set("advertising_industry_filters", rs)
+
+	xlog.Debugf("%s", bm.JsonBody())
+}
diff --git a/doc/wechat_v3.md b/doc/wechat_v3.md
@@ -349,7 +349,11 @@ wechat.V3DecryptScoreNotifyCipherText()
     * 修改结算账号：`client.V3Apply4SubModifySettlement()`
     * 查询结算账户：`client.V3Apply4SubQuerySettlement()`
 * <font color='#07C160' size='4'>点金计划（服务商）</font>
-    * 待实现-[文档](https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_5_1.shtml)
+    * 点金计划管理：`client.V3GoldPlanManage()`
+    * 商家小票管理：`client.V3GoldPlanBillManage()`
+    * 同业过滤标签管理：`client.V3GoldPlanFilterManage()`
+    * 开通广告展示：`client.V3GoldPlanOpenAdShow()`
+    * 关闭广告展示：`client.V3GoldPlanCloseAdShow()`
 * <font color='#07C160' size='4'>电商收付通（商户进件）</font>
     * 二级商户进件：`client.V3EcommerceApply()`
     * 查询申请状态：`client.V3EcommerceApplyStatus()`
diff --git a/release_note.txt b/release_note.txt
@@ -2,7 +2,14 @@
 修改记录：
    (1) 微信V3：新增 client.V3EcommerceApply()，二级商户进件
    (2) 微信V3：新增 client.V3EcommerceApplyStatus()，查询申请状态
-   (3) 微信V3：公有化 wechat.GetReleaseSign()、wechat.GetSandBoxSign() 方法
+   (3) 微信V3：新增 client.V3GoldPlanManage()，点金计划管理
+   (4) 微信V3：新增 client.V3GoldPlanBillManage()，商家小票管理
+   (5) 微信V3：新增 client.V3GoldPlanFilterManage()，同业过滤标签管理
+   (6) 微信V3：新增 client.V3GoldPlanOpenAdShow()，开通广告展示
+   (7) 微信V3：新增 client.V3GoldPlanCloseAdShow()，关闭广告展示
+   (8) 微信V3：公有化 wechat.GetReleaseSign()、wechat.GetSandBoxSign() 方法
+   (9) 微信V3：修改 client.V3PartnerCloseOrder() 入参参数
+   (10) GoPay：一些小修改优化
 
 版本号：Release 1.5.64
 修改记录：
diff --git a/wechat/v3/cert.go b/wechat/v3/cert.go
@@ -109,7 +109,7 @@ func GetPlatformCerts(ctx context.Context, mchid, apiV3Key, serialNo, privateKey
 }
 
 // Deprecated
-// 推荐直接使用 GetAndSelectNewestCert() 方法
+// 推荐直接使用 client.GetAndSelectNewestCert() 方法
 // 获取微信平台证书公钥（获取后自行保存使用，如需定期刷新功能，自行实现）
 //	注意事项
 //	如果自行实现验证平台签名逻辑的话，需要注意以下事项:
@@ -171,6 +171,7 @@ func (c *ClientV3) GetPlatformCerts() (certs *PlatformCertRsp, err error) {
 }
 
 // Deprecated
+// client 已内部集成证书获取并维护，无需再Set正式
 // 设置 微信支付平台证书 和 证书序列号
 //	注意：请预先通过 client.GetPlatformCerts() 获取 微信平台公钥证书 和 证书序列号
 //	部分接口请求参数中敏感信息加密，使用此 微信支付平台公钥 和 证书序列号
@@ -192,7 +193,7 @@ func (c *ClientV3) DecryptCerts(ciphertext, nonce, additional string) (wxCerts s
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), c.ApiV3Key)
 	if err != nil {
-		return "", fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return "", fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	return string(decrypt), nil
 }
diff --git a/wechat/v3/client_test.go b/wechat/v3/client_test.go
@@ -2,6 +2,7 @@ package wechat
 
 import (
 	"context"
+	"crypto/rsa"
 	"crypto/sha256"
 	"encoding/hex"
 	"io/ioutil"
@@ -103,20 +104,23 @@ func TestGetAndSelectNewestCert(t *testing.T) {
 	xlog.Infof("WxContent: \n%s", cert)
 }
 
-func TestV3VerifySign(t *testing.T) {
+func TestV3VerifySignByPK(t *testing.T) {
 	// type SignInfo struct {
 	//	HeaderTimestamp string `json:"Wechatpay-Timestamp"`
 	//	HeaderNonce     string `json:"Wechatpay-Nonce"`
 	//	HeaderSignature string `json:"Wechatpay-Signature"`
 	//	HeaderSerial    string `json:"Wechatpay-Serial"`
 	//	SignBody        string `json:"sign_body"`
 	//}
+
+	wxPublicKey := &rsa.PublicKey{}
+
 	timestamp := "1609149813"
 	nonce := "c4682f0902e4c7fd5cfb7568a2a45e1b"
 	signBody := `{"code_url":"weixin://wxpay/bizpayurl?pr=5zPMHa4zz"}`
 	signature := "D/nRx+h1To/ybCJkJYTXptoSp6+UVPsKNlJ2AsHMf76rXq2qAYDSnoOTB4HRc8ZlPNck5JfeZ19lDXAJ/N9gyvWEwE3n01HNhaKqxOjW0C1KROCtxAj1Wd2qtMyiCzh/Azuk15eIHjht03teGQFDmowoOBSlMg9qOBaK8MNfwFcXvV3J12AMbFFR7s4cXbqzuk2qBeMAz6VrKDAwDHxZOWFqME59mg4bPWwBTNyYeCQVR2sqPflLvY1zttEGMN3s/CDvgLQ/SXZrAsHlS2lkDVHEc/sP9q0x9oU8lFL6DhD6eDU2mVP3pt7CPD/5QAnGnINaHIcZVj6Vb4l3PKzeog=="
 
-	err = V3VerifySign(timestamp, nonce, signBody, signature, "WxPublicKeyContent")
+	err = V3VerifySignByPK(timestamp, nonce, signBody, signature, wxPublicKey)
 	if err != nil {
 		xlog.Error(err)
 		return
@@ -301,7 +305,6 @@ func TestV3BillDownLoadBill(t *testing.T) {
 }
 
 func TestV3ProfitSharingOrder(t *testing.T) {
-	client.autoSign = true
 	var rs []*ProfitSharingReceiver
 	item := &ProfitSharingReceiver{
 		Type:        "PERSONAL_OPENID",
@@ -448,3 +451,21 @@ func TestClientV3_V3ComplaintUploadImage(t *testing.T) {
 	}
 	xlog.Errorf("wxRsp: %s", wxRsp.Error)
 }
+
+func TestV3GoldPlanFilterManage(t *testing.T) {
+	var rs []string
+	rs = append(rs, "SOFTWARE")
+	rs = append(rs, "SECURITY")
+	rs = append(rs, "LOVE_MARRIAGE")
+
+	bm := make(gopay.BodyMap)
+	bm.Set("sub_mchid", "2021060717").
+		Set("advertising_industry_filters", rs)
+
+	wxRsp, err := client.V3GoldPlanFilterManage(ctx, bm)
+	if err != nil {
+		xlog.Error(err)
+		return
+	}
+	xlog.Debugf("wxRsp: %#v", wxRsp)
+}
diff --git a/wechat/v3/constant.go b/wechat/v3/constant.go
@@ -147,7 +147,7 @@ const (
 	v3GoldPlanBillManage   = "/v3/goldplan/merchants/changecustompagestatus"          // 商家小票管理 POST
 	v3GoldPlanFilterManage = "/v3/goldplan/merchants/set-advertising-industry-filter" // 同业过滤标签管理 POST
 	v3GoldPlanOpenAdShow   = "/v3/goldplan/merchants/open-advertising-show"           // 开通广告展示 PATCH
-	v3GoldPlanCloseAdShow  = "/v3/goldplan/merchants/close-advertising-show"          // 关闭广告展示 PATCH
+	v3GoldPlanCloseAdShow  = "/v3/goldplan/merchants/close-advertising-show"          // 关闭广告展示 POST
 
 	// 消费者投诉2.0
 	v3ComplaintList               = "/v3/merchant-service/complaints-v2"                         // 查询投诉单列表 GET
diff --git a/wechat/v3/encrypt_decrypt.go b/wechat/v3/encrypt_decrypt.go
@@ -71,11 +71,11 @@ func V3DecryptNotifyCipherText(ciphertext, nonce, additional, apiV3Key string) (
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
@@ -85,11 +85,11 @@ func V3DecryptPartnerNotifyCipherText(ciphertext, nonce, additional, apiV3Key st
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptPartnerResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
@@ -99,11 +99,11 @@ func V3DecryptRefundNotifyCipherText(ciphertext, nonce, additional, apiV3Key str
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptRefundResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
@@ -113,11 +113,11 @@ func V3DecryptPartnerRefundNotifyCipherText(ciphertext, nonce, additional, apiV3
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptPartnerRefundResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
@@ -127,11 +127,11 @@ func V3DecryptCombineNotifyCipherText(ciphertext, nonce, additional, apiV3Key st
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptCombineResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
@@ -141,11 +141,11 @@ func V3DecryptProfitShareNotifyCipherText(ciphertext, nonce, additional, apiV3Ke
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptProfitShareResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
@@ -155,11 +155,11 @@ func V3DecryptScoreNotifyCipherText(ciphertext, nonce, additional, apiV3Key stri
 	cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)
 	decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))
 	if err != nil {
-		return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)
+		return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)
 	}
 	result = &V3DecryptScoreResult{}
 	if err = json.Unmarshal(decrypt, result); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)
+		return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)
 	}
 	return result, nil
 }
diff --git a/wechat/v3/gold_plan.go b/wechat/v3/gold_plan.go
@@ -0,0 +1,123 @@
+package wechat
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/go-pay/gopay"
+)
+
+// 点金计划管理API
+//	Code = 0 is success
+//	服务商文档：https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_5_1.shtml
+func (c *ClientV3) V3GoldPlanManage(ctx context.Context, bm gopay.BodyMap) (wxRsp *GoldPlanManageRsp, err error) {
+	authorization, err := c.authorization(MethodPost, v3GoldPlanManage, bm)
+	if err != nil {
+		return nil, err
+	}
+	res, si, bs, err := c.doProdPost(ctx, bm, v3GoldPlanManage, authorization)
+	if err != nil {
+		return nil, err
+	}
+	wxRsp = &GoldPlanManageRsp{Code: Success, SignInfo: si}
+	wxRsp.Response = new(GoldPlanManage)
+	if err = json.Unmarshal(bs, wxRsp.Response); err != nil {
+		return nil, fmt.Errorf("json.Unmarshal(%s)：%w", string(bs), err)
+	}
+	if res.StatusCode != http.StatusOK {
+		wxRsp.Code = res.StatusCode
+		wxRsp.Error = string(bs)
+		return wxRsp, nil
+	}
+	return wxRsp, c.verifySyncSign(si)
+}
+
+// 商家小票管理API
+//	Code = 0 is success
+//	服务商文档：https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_5_2.shtml
+func (c *ClientV3) V3GoldPlanBillManage(ctx context.Context, bm gopay.BodyMap) (wxRsp *GoldPlanManageRsp, err error) {
+	authorization, err := c.authorization(MethodPost, v3GoldPlanBillManage, bm)
+	if err != nil {
+		return nil, err
+	}
+	res, si, bs, err := c.doProdPost(ctx, bm, v3GoldPlanBillManage, authorization)
+	if err != nil {
+		return nil, err
+	}
+	wxRsp = &GoldPlanManageRsp{Code: Success, SignInfo: si}
+	wxRsp.Response = new(GoldPlanManage)
+	if err = json.Unmarshal(bs, wxRsp.Response); err != nil {
+		return nil, fmt.Errorf("json.Unmarshal(%s)：%w", string(bs), err)
+	}
+	if res.StatusCode != http.StatusOK {
+		wxRsp.Code = res.StatusCode
+		wxRsp.Error = string(bs)
+		return wxRsp, nil
+	}
+	return wxRsp, c.verifySyncSign(si)
+}
+
+// 同业过滤标签管理API
+//	Code = 0 is success
+//	服务商文档：https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_5_3.shtml
+func (c *ClientV3) V3GoldPlanFilterManage(ctx context.Context, bm gopay.BodyMap) (wxRsp *EmptyRsp, err error) {
+	authorization, err := c.authorization(MethodPost, v3GoldPlanFilterManage, bm)
+	if err != nil {
+		return nil, err
+	}
+	res, si, bs, err := c.doProdPost(ctx, bm, v3GoldPlanFilterManage, authorization)
+	if err != nil {
+		return nil, err
+	}
+	wxRsp = &EmptyRsp{Code: Success, SignInfo: si}
+	if res.StatusCode != http.StatusNoContent {
+		wxRsp.Code = res.StatusCode
+		wxRsp.Error = string(bs)
+		return wxRsp, nil
+	}
+	return wxRsp, c.verifySyncSign(si)
+}
+
+// 开通广告展示API
+//	Code = 0 is success
+//	服务商文档：https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_5_4.shtml
+func (c *ClientV3) V3GoldPlanOpenAdShow(ctx context.Context, bm gopay.BodyMap) (wxRsp *EmptyRsp, err error) {
+	authorization, err := c.authorization(MethodPATCH, v3GoldPlanOpenAdShow, bm)
+	if err != nil {
+		return nil, err
+	}
+	res, si, bs, err := c.doProdPatch(ctx, bm, v3GoldPlanOpenAdShow, authorization)
+	if err != nil {
+		return nil, err
+	}
+	wxRsp = &EmptyRsp{Code: Success, SignInfo: si}
+	if res.StatusCode != http.StatusNoContent {
+		wxRsp.Code = res.StatusCode
+		wxRsp.Error = string(bs)
+		return wxRsp, nil
+	}
+	return wxRsp, c.verifySyncSign(si)
+}
+
+// 关闭广告展示API
+//	Code = 0 is success
+//	服务商文档：https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_5_5.shtml
+func (c *ClientV3) V3GoldPlanCloseAdShow(ctx context.Context, bm gopay.BodyMap) (wxRsp *EmptyRsp, err error) {
+	authorization, err := c.authorization(MethodPATCH, v3GoldPlanCloseAdShow, bm)
+	if err != nil {
+		return nil, err
+	}
+	res, si, bs, err := c.doProdPost(ctx, bm, v3GoldPlanCloseAdShow, authorization)
+	if err != nil {
+		return nil, err
+	}
+	wxRsp = &EmptyRsp{Code: Success, SignInfo: si}
+	if res.StatusCode != http.StatusNoContent {
+		wxRsp.Code = res.StatusCode
+		wxRsp.Error = string(bs)
+		return wxRsp, nil
+	}
+	return wxRsp, c.verifySyncSign(si)
+}
diff --git a/wechat/v3/model.go b/wechat/v3/model.go
diff --git a/wechat/v3/notify.go b/wechat/v3/notify.go
diff --git a/wechat/v3/pay_partner.go b/wechat/v3/pay_partner.go
diff --git a/wechat/v3/sign.go b/wechat/v3/sign.go

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (a *Client) RequestParam(bm gopay.BodyMap, method string) (string, error) {`
`114`	`114`	`if bm.GetString("sign") == "" {`
`115`	`115`	`sign, err = GetRsaSign(bm, bm.GetString("sign_type"), a.privateKey)`
`116`	`116`	`if err != nil {`
`117`		`- return "", fmt.Errorf("GetRsaSign Error: %v", err)`
	`117`	`+ return "", fmt.Errorf("GetRsaSign Error: %w", err)`
`118`	`118`	`}`
`119`	`119`	`bm.Set("sign", sign)`
`120`	`120`	`}`
`@@ -162,7 +162,7 @@ func (a *Client) doAliPaySelf(ctx context.Context, bm gopay.BodyMap, method stri`
`162`	`162`	`if bm.GetString("sign") == "" {`
`163`	`163`	`sign, err = GetRsaSign(bm, bm.GetString("sign_type"), a.privateKey)`
`164`	`164`	`if err != nil {`
`165`		`- return nil, fmt.Errorf("GetRsaSign Error: %v", err)`
	`165`	`+ return nil, fmt.Errorf("GetRsaSign Error: %w", err)`
`166`	`166`	`}`
`167`	`167`	`bm.Set("sign", sign)`
`168`	`168`	`}`
`@@ -243,7 +243,7 @@ func (a *Client) doAliPay(ctx context.Context, bm gopay.BodyMap, method string,`
`243`	`243`	`}`
`244`	`244`	`sign, err := GetRsaSign(pubBody, pubBody.GetString("sign_type"), a.privateKey)`
`245`	`245`	`if err != nil {`
`246`		`- return nil, fmt.Errorf("GetRsaSign Error: %v", err)`
	`246`	`+ return nil, fmt.Errorf("GetRsaSign Error: %w", err)`
`247`	`247`	`}`
`248`	`248`	`pubBody.Set("sign", sign)`
`249`	`249`	`if a.DebugSwitch == gopay.DebugOn {`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func GetPlatformCerts(ctx context.Context, mchid, apiV3Key, serialNo, privateKey`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// Deprecated`
`112`		`-// 推荐直接使用 GetAndSelectNewestCert() 方法`
	`112`	`+// 推荐直接使用 client.GetAndSelectNewestCert() 方法`
`113`	`113`	`// 获取微信平台证书公钥（获取后自行保存使用，如需定期刷新功能，自行实现）`
`114`	`114`	`// 注意事项`
`115`	`115`	`// 如果自行实现验证平台签名逻辑的话，需要注意以下事项:`
`@@ -171,6 +171,7 @@ func (c ClientV3) GetPlatformCerts() (certs PlatformCertRsp, err error) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`// Deprecated`
	`174`	`+// client 已内部集成证书获取并维护，无需再Set正式`
`174`	`175`	`// 设置微信支付平台证书和证书序列号`
`175`	`176`	`// 注意：请预先通过 client.GetPlatformCerts() 获取微信平台公钥证书和证书序列号`
`176`	`177`	`// 部分接口请求参数中敏感信息加密，使用此微信支付平台公钥和证书序列号`
`@@ -192,7 +193,7 @@ func (c *ClientV3) DecryptCerts(ciphertext, nonce, additional string) (wxCerts s`
`192`	`193`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`193`	`194`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), c.ApiV3Key)`
`194`	`195`	`if err != nil {`
`195`		`- return "", fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`196`	`+ return "", fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`196`	`197`	`}`
`197`	`198`	`return string(decrypt), nil`
`198`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,11 @@ func V3DecryptNotifyCipherText(ciphertext, nonce, additional, apiV3Key string) (`
`71`	`71`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`72`	`72`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`73`	`73`	`if err != nil {`
`74`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`74`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`75`	`75`	`}`
`76`	`76`	`result = &V3DecryptResult{}`
`77`	`77`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`78`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`78`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`79`	`79`	`}`
`80`	`80`	`return result, nil`
`81`	`81`	`}`
`@@ -85,11 +85,11 @@ func V3DecryptPartnerNotifyCipherText(ciphertext, nonce, additional, apiV3Key st`
`85`	`85`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`86`	`86`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`87`	`87`	`if err != nil {`
`88`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`88`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`89`	`89`	`}`
`90`	`90`	`result = &V3DecryptPartnerResult{}`
`91`	`91`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`92`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`92`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`93`	`93`	`}`
`94`	`94`	`return result, nil`
`95`	`95`	`}`
`@@ -99,11 +99,11 @@ func V3DecryptRefundNotifyCipherText(ciphertext, nonce, additional, apiV3Key str`
`99`	`99`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`100`	`100`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`101`	`101`	`if err != nil {`
`102`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`102`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`103`	`103`	`}`
`104`	`104`	`result = &V3DecryptRefundResult{}`
`105`	`105`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`106`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`106`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`107`	`107`	`}`
`108`	`108`	`return result, nil`
`109`	`109`	`}`
`@@ -113,11 +113,11 @@ func V3DecryptPartnerRefundNotifyCipherText(ciphertext, nonce, additional, apiV3`
`113`	`113`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`114`	`114`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`115`	`115`	`if err != nil {`
`116`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`116`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`117`	`117`	`}`
`118`	`118`	`result = &V3DecryptPartnerRefundResult{}`
`119`	`119`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`120`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`120`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`121`	`121`	`}`
`122`	`122`	`return result, nil`
`123`	`123`	`}`
`@@ -127,11 +127,11 @@ func V3DecryptCombineNotifyCipherText(ciphertext, nonce, additional, apiV3Key st`
`127`	`127`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`128`	`128`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`129`	`129`	`if err != nil {`
`130`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`130`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`131`	`131`	`}`
`132`	`132`	`result = &V3DecryptCombineResult{}`
`133`	`133`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`134`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`134`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`135`	`135`	`}`
`136`	`136`	`return result, nil`
`137`	`137`	`}`
`@@ -141,11 +141,11 @@ func V3DecryptProfitShareNotifyCipherText(ciphertext, nonce, additional, apiV3Ke`
`141`	`141`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`142`	`142`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`143`	`143`	`if err != nil {`
`144`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`144`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`145`	`145`	`}`
`146`	`146`	`result = &V3DecryptProfitShareResult{}`
`147`	`147`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`148`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`148`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`149`	`149`	`}`
`150`	`150`	`return result, nil`
`151`	`151`	`}`
`@@ -155,11 +155,11 @@ func V3DecryptScoreNotifyCipherText(ciphertext, nonce, additional, apiV3Key stri`
`155`	`155`	`cipherBytes, _ := base64.StdEncoding.DecodeString(ciphertext)`
`156`	`156`	`decrypt, err := aes.GCMDecrypt(cipherBytes, []byte(nonce), []byte(additional), []byte(apiV3Key))`
`157`	`157`	`if err != nil {`
`158`		`- return nil, fmt.Errorf("aes.GCMDecrypt, err:%+v", err)`
	`158`	`+ return nil, fmt.Errorf("aes.GCMDecrypt, err:%w", err)`
`159`	`159`	`}`
`160`	`160`	`result = &V3DecryptScoreResult{}`
`161`	`161`	`if err = json.Unmarshal(decrypt, result); err != nil {`
`162`		`- return nil, fmt.Errorf("json.Unmarshal(%s), err:%+v", string(decrypt), err)`
	`162`	`+ return nil, fmt.Errorf("json.Unmarshal(%s), err:%w", string(decrypt), err)`
`163`	`163`	`}`
`164`	`164`	`return result, nil`
`165`	`165`	`}`