diff --git a/go.mod b/go.mod index 8c3663e..8c90453 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module plugins go 1.21 -require codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701085519-f6acae1d59f9 +require codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701100526-b5800026d122 require ( github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect diff --git a/go.sum b/go.sum index 0011bee..3776ad2 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701062026-8d942924 codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701062026-8d942924410e/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ= codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701085519-f6acae1d59f9 h1:U0ZsVK8mZBDxL3Nm6Btf3tEYZqC434qgubaZwnSL/7g= codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701085519-f6acae1d59f9/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ= +codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701100526-b5800026d122 h1:9Ynv/7GOtnPJHCEBfhqRBTTiTLRI7DqTY311Nk75yes= +codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701100526-b5800026d122/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/plugins/zltx/go.mod b/plugins/zltx/go.mod index bff298d..a53a925 100644 --- a/plugins/zltx/go.mod +++ b/plugins/zltx/go.mod @@ -3,7 +3,7 @@ module plugins/zltx go 1.21 require ( - codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701085519-f6acae1d59f9 + codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701100526-b5800026d122 github.com/carlmjohnson/requests v0.23.5 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/zltx/go.sum b/plugins/zltx/go.sum index 881d048..2ac66d8 100644 --- a/plugins/zltx/go.sum +++ b/plugins/zltx/go.sum @@ -8,6 +8,8 @@ codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701084422-a0dcbe43 codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701084422-a0dcbe4339b0/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ= codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701085519-f6acae1d59f9 h1:U0ZsVK8mZBDxL3Nm6Btf3tEYZqC434qgubaZwnSL/7g= codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701085519-f6acae1d59f9/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ= +codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701100526-b5800026d122 h1:9Ynv/7GOtnPJHCEBfhqRBTTiTLRI7DqTY311Nk75yes= +codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240701100526-b5800026d122/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/carlmjohnson/requests v0.23.5 h1:NPANcAofwwSuC6SIMwlgmHry2V3pLrSqRiSBKYbNHHA= diff --git a/plugins/zltx/internal/transform.go b/plugins/zltx/internal/transform.go index c01710c..f126f37 100644 --- a/plugins/zltx/internal/transform.go +++ b/plugins/zltx/internal/transform.go @@ -7,17 +7,17 @@ import ( "time" ) -func rechargeReq(c *proto.OrderRequest) *po.OrderReq { +func rechargeReq(in *proto.OrderRequest) *po.OrderReq { return &po.OrderReq{ - MerchantId: c.Config.AppId, - OutTradeNo: c.Order.OrderNo, - ProductId: c.Product.ProductNo, - RechargeAccount: c.Order.Account, + MerchantId: in.Config.AppId, + OutTradeNo: in.Order.OrderNo, + ProductId: in.Product.ProductNo, + RechargeAccount: in.Order.Account, AccountType: 1, - Number: 1, + Number: in.Order.Quantity, Version: "1.0", TimeStamp: time.Now().Unix(), - NotifyUrl: c.Config.NotifyUrl, + NotifyUrl: in.Config.NotifyUrl, } } @@ -56,12 +56,12 @@ func queryResp(request *proto.QueryRequest, resp po.QueryResp) *proto.QueryRespo } } -func notifyResp(poReq po.Notify) *proto.NotifyResponse { - data, _ := json.Marshal(poReq) +func notifyResp(in po.Notify) *proto.NotifyResponse { + data, _ := json.Marshal(in) return &proto.NotifyResponse{ Result: &proto.Result{ - Status: poReq.Status.GetOrderStatus(), - OrderNo: poReq.OutTradeNo, + Status: in.Status.GetOrderStatus(), + OrderNo: in.OutTradeNo, TradeNo: "", Message: "", Data: data,