From aa766ccb28ed6077aafa3ce1962c833bd4830508 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: Mon, 2 Sep 2024 14:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=BA=A2=E5=8C=85=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8A=A0=E8=BD=BD=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/alipay_redpack.go                                  | 1 +
 cmd/wechat_cpn.go                                      | 1 +
 cmd/wechat_redpack.go                                  | 5 +++--
 cmd/zltx.go                                            | 1 +
 plugins/wechat_redpack/internal/transform.go           | 8 ++++----
 plugins/wechat_redpack/internal/wechat_redpack.go      | 2 +-
 plugins/wechat_redpack/internal/wechat_redpack_test.go | 6 +++---
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/cmd/alipay_redpack.go b/cmd/alipay_redpack.go
index 4e13434..5a5f7d4 100644
--- a/cmd/alipay_redpack.go
+++ b/cmd/alipay_redpack.go
@@ -35,6 +35,7 @@ func alipayRedPack() {
 	if err != nil {
 		log.Fatalln(err)
 	}
+	defer manage.Close()
 	queryRequest := &proto.QueryRequest{
 		Config: getAlpayRedConf(),
 		Order: &proto.QueryRequest_Order{
diff --git a/cmd/wechat_cpn.go b/cmd/wechat_cpn.go
index e20c394..7b282a2 100644
--- a/cmd/wechat_cpn.go
+++ b/cmd/wechat_cpn.go
@@ -32,6 +32,7 @@ func wechatCpn() {
 	if err != nil {
 		log.Fatalln(err)
 	}
+	defer manage.Close()
 	queryRequest := &proto.QueryRequest{
 		Config: getWechatCpnConf(),
 		Order: &proto.QueryRequest_Order{
diff --git a/cmd/wechat_redpack.go b/cmd/wechat_redpack.go
index 2de6319..be8a234 100644
--- a/cmd/wechat_redpack.go
+++ b/cmd/wechat_redpack.go
@@ -32,6 +32,7 @@ func wechatRedPack() {
 	if err != nil {
 		log.Fatalln(err)
 	}
+	defer manage.Close()
 	wechatRedPackQuery()
 }
 
@@ -62,8 +63,8 @@ func wechatRedPackQuery() {
 	queryRequest := &proto.QueryRequest{
 		Config: getWechatRedPackConf(),
 		Order: &proto.QueryRequest_Order{
-			OrderNo: "",
-			TradeNo: "131000508038701499912952024090256259261117",
+			OrderNo: "240403164049635931",
+			TradeNo: "",
 			Account: "",
 			Extra:   []byte(`{"out_detail_no":"123456789"}`),
 		},
diff --git a/cmd/zltx.go b/cmd/zltx.go
index e3670ec..98ea67e 100644
--- a/cmd/zltx.go
+++ b/cmd/zltx.go
@@ -40,6 +40,7 @@ func zltx() {
 	if err != nil {
 		log.Fatalln(err)
 	}
+	defer manage.Close()
 	orderRequest := &proto.OrderRequest{
 		Config: config(),
 		Order: &proto.OrderRequest_Order{
diff --git a/plugins/wechat_redpack/internal/transform.go b/plugins/wechat_redpack/internal/transform.go
index ffe5bb6..7c531fe 100644
--- a/plugins/wechat_redpack/internal/transform.go
+++ b/plugins/wechat_redpack/internal/transform.go
@@ -73,7 +73,7 @@ func orderResp(order *proto.OrderRequest_Order, tradeNo string) *proto.OrderResp
 	}
 }
 
-func queryReq(order *proto.QueryRequest_Order) (*transferbatch.GetTransferDetailByNoRequest, error) {
+func queryReq(order *proto.QueryRequest_Order) (*transferbatch.GetTransferDetailByOutNoRequest, error) {
 	var orderExtra OrderExtra
 	if order.Extra != nil {
 		err := json.Unmarshal(order.Extra, &orderExtra)
@@ -81,9 +81,9 @@ func queryReq(order *proto.QueryRequest_Order) (*transferbatch.GetTransferDetail
 			return nil, fmt.Errorf("order extra json unmarshal error: %v", err)
 		}
 	}
-	return &transferbatch.GetTransferDetailByNoRequest{
-		BatchId:  core.String(order.OrderNo),
-		DetailId: core.String(orderExtra.OutDetailNo),
+	return &transferbatch.GetTransferDetailByOutNoRequest{
+		OutDetailNo: core.String(orderExtra.OutDetailNo),
+		OutBatchNo:  core.String(order.OrderNo),
 	}, nil
 }
 
diff --git a/plugins/wechat_redpack/internal/wechat_redpack.go b/plugins/wechat_redpack/internal/wechat_redpack.go
index 3d0789c..67984ec 100644
--- a/plugins/wechat_redpack/internal/wechat_redpack.go
+++ b/plugins/wechat_redpack/internal/wechat_redpack.go
@@ -52,7 +52,7 @@ func (p *WeChatRedPackService) Query(ctx context.Context, request *proto.QueryRe
 	if err != nil {
 		return nil, err
 	}
-	resp, result, err := svc.GetTransferDetailByNo(ctx, *req)
+	resp, result, err := svc.GetTransferDetailByOutNo(ctx, *req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugins/wechat_redpack/internal/wechat_redpack_test.go b/plugins/wechat_redpack/internal/wechat_redpack_test.go
index 21911cf..496c915 100644
--- a/plugins/wechat_redpack/internal/wechat_redpack_test.go
+++ b/plugins/wechat_redpack/internal/wechat_redpack_test.go
@@ -51,10 +51,10 @@ func TestQuery(t *testing.T) {
 	request := &proto.QueryRequest{
 		Config: config(),
 		Order: &proto.QueryRequest_Order{
-			OrderNo: "",
-			TradeNo: "202408211517304392270563",
+			OrderNo: "240403164049635931",
+			TradeNo: "",
 			Account: "",
-			Extra:   []byte(`{"out_detail_no":"20240821151730439227056399842027"}`),
+			Extra:   []byte(`{"out_detail_no":"123456789"}`),
 		},
 	}
 	t.Run("TestQuery", func(t *testing.T) {