From 55e03af21ea183fa8bfb7a721177d5bb44f00b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= <zi__mm@163.com>
Date: Thu, 22 Aug 2024 16:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6-=E4=BA=91=E9=97=AA=E4=BB=98?=
 =?UTF-8?q?=E7=BA=A2=E5=8C=85,=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/weixin_redpack/internal/util.go       | 42 -------------------
 .../internal/weixin_redpack_test.go           |  1 -
 2 files changed, 43 deletions(-)

diff --git a/plugins/weixin_redpack/internal/util.go b/plugins/weixin_redpack/internal/util.go
index ed2eb55..4906d19 100644
--- a/plugins/weixin_redpack/internal/util.go
+++ b/plugins/weixin_redpack/internal/util.go
@@ -8,7 +8,6 @@ import (
 	"github.com/wechatpay-apiv3/wechatpay-go/core/option"
 	"github.com/wechatpay-apiv3/wechatpay-go/services/transferbatch"
 	"github.com/wechatpay-apiv3/wechatpay-go/utils"
-	"log"
 	"plugins/utils/weixin"
 )
 
@@ -22,8 +21,6 @@ func transferBatchApiService(ctx context.Context, c *weixin.Server) (*transferba
 }
 
 func transferDetailApiService(ctx context.Context, c *weixin.Server) (*transferbatch.TransferDetailApiService, error) {
-	cl()
-	return nil, fmt.Errorf("----")
 	mchPrivateKey, err := utils.LoadPrivateKeyWithPath(c.PrivateKeyPath)
 	if err != nil {
 		return nil, fmt.Errorf("MchID[%s] load merchant private key error:%v", c.MchID, err)
@@ -47,45 +44,6 @@ func transferDetailApiService(ctx context.Context, c *weixin.Server) (*transferb
 	return &svc, nil
 }
 
-func cl() {
-	var (
-		mchID                      string = "1629276485"                               // 商户号
-		mchCertificateSerialNumber string = "3C7E21B74C04BE6227A690EB44184F219D763F92" // 商户证书序列号
-		mchAPIv3Key                string = "ChengDuBale0123456789qwertyuiopa"         // 商户APIv3密钥
-	)
-	// 使用 utils 提供的函数从本地文件中加载商户私钥，商户私钥会用来生成请求的签名
-	//mchPrivateKey, err := utils.LoadPrivateKeyWithPath("/path/to/merchant/apiclient_key.pem")
-	mchPrivateKey, err := utils.LoadPrivateKeyWithPath("/Users/lsxd/code/php/yxxt/market/config/wechatcash/apiclient_key.pem")
-	if err != nil {
-		log.Printf("load merchant private key error:%s", err)
-		return
-	}
-	ctx := context.Background()
-	// 使用商户私钥等初始化 client，并使它具有自动定时获取微信支付平台证书的能力
-	opts := []core.ClientOption{
-		option.WithWechatPayAutoAuthCipher(mchID, mchCertificateSerialNumber, mchPrivateKey, mchAPIv3Key),
-	}
-	client, err := core.NewClient(ctx, opts...)
-	if err != nil {
-		log.Printf("new wechat pay client err:%s", err)
-		return
-	}
-	svc := transferbatch.TransferDetailApiService{Client: client}
-	resp, result, err := svc.GetTransferDetailByNo(ctx,
-		transferbatch.GetTransferDetailByNoRequest{
-			BatchId:  core.String("1030000071100999991182020050700019480001"),
-			DetailId: core.String("1040000071100999991182020050700019500100"),
-		},
-	)
-	if err != nil {
-		// 处理错误
-		log.Printf("call GetTransferDetailByNo err:%s", err)
-	} else {
-		// 处理返回结果
-		log.Printf("status=%d resp=%s", result.Response.StatusCode, resp)
-	}
-}
-
 func verify(ctx context.Context, c *weixin.Server) error {
 	err := c.Verify(ctx, "", "")
 	if err != nil {
diff --git a/plugins/weixin_redpack/internal/weixin_redpack_test.go b/plugins/weixin_redpack/internal/weixin_redpack_test.go
index 1cc94af..66a2721 100644
--- a/plugins/weixin_redpack/internal/weixin_redpack_test.go
+++ b/plugins/weixin_redpack/internal/weixin_redpack_test.go
@@ -19,7 +19,6 @@ func config() []byte {
 		MchAPIv3Key:                "ChengDuBale0123456789qwertyuiopa",
 		// 商户API私钥
 		PrivateKeyPath: "/Users/lsxd/code/php/yxxt/market/config/wechatcash/apiclient_key.pem",
-		//PrivateKeyPath: "/Users/lsxd/code/go/other/mq/wx/wechat_private_key.pem",
 	}
 	marshal, _ := json.Marshal(c)
 	return marshal