From 0fa9812f99d090f4808b66b3b7b7b7d5c7c01f15 Mon Sep 17 00:00:00 2001 From: jiahui Date: Fri, 10 Nov 2023 10:16:01 +0800 Subject: [PATCH] add describe wechat --- service/pay/helper/dto.go | 32 +++++++++++++++++--------------- service/pay/method/wechat.go | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/service/pay/helper/dto.go b/service/pay/helper/dto.go index 386884d0645..d103a79b38b 100644 --- a/service/pay/helper/dto.go +++ b/service/pay/helper/dto.go @@ -1,19 +1,21 @@ package helper type Request struct { - AppID int64 `json:"appID"` - Sign string `json:"sign"` - PayMethod string `json:"payMethod"` - Amount string `json:"amount"` - User string `json:"user"` - PayAppName string `json:"payAppName,omitempty"` - Currency string `json:"currency,omitempty"` - AmountOptions []string `json:"amountOptions,omitempty"` - ExchangeRate float64 `json:"exchangeRate,omitempty"` - TaxRate float64 `json:"taxRate,omitempty"` - TradeNO string `json:"tradeNO,omitempty"` - StripeSuccessURL string `json:"stripeSuccessUrl,omitempty"` - StripeCancelURL string `json:"stripeCancelUrl,omitempty"` - SessionID string `json:"sessionID,omitempty"` - OrderID string `json:"orderID,omitempty"` + AppID int64 `json:"appID"` + Sign string `json:"sign"` + PayMethod string `json:"payMethod"` + Amount string `json:"amount"` + User string `json:"user"` + PayAppName string `json:"payAppName,omitempty"` + Currency string `json:"currency,omitempty"` + AmountOptions []string `json:"amountOptions,omitempty"` + ExchangeRate float64 `json:"exchangeRate,omitempty"` + TaxRate float64 `json:"taxRate,omitempty"` + TradeNO string `json:"tradeNO,omitempty"` + StripeSuccessURL string `json:"stripeSuccessUrl,omitempty"` + StripeCancelURL string `json:"stripeCancelUrl,omitempty"` + SessionID string `json:"sessionID,omitempty"` + OrderID string `json:"orderID,omitempty"` + Describe string `json:"describe,omitempty"` + WechatCallbackURL string `json:"wechatCallbackUrl,omitempty"` } diff --git a/service/pay/method/wechat.go b/service/pay/method/wechat.go index b69450dbcd6..438edee1d21 100644 --- a/service/pay/method/wechat.go +++ b/service/pay/method/wechat.go @@ -36,7 +36,7 @@ func GetWechatURL(c *gin.Context, request *helper.Request, client *mongo.Client) user := request.User tradeNO := pay.GetRandomString(32) - codeURL, err := pay.WechatPay(amount, user, tradeNO, "", "") + codeURL, err := pay.WechatPay(amount, user, tradeNO, request.Describe, request.WechatCallbackURL) if err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("error codeURL : %s, %v", codeURL, err)}) return