feat: fix alipay payment provider (#2330)

* feat: support alipay payment provider

* feat: update notify params

* feat: update root cert

* feat: update ProviderEditPage.js

* feat: gofumpt
This commit is contained in:
haiwu
2023-09-13 17:30:51 +08:00
committed by GitHub
parent bb04b10e8b
commit 08a0092974
17 changed files with 157 additions and 138 deletions

View File

@ -16,7 +16,6 @@ package object
import (
"fmt"
"net/http"
"github.com/casdoor/casdoor/pp"
@ -153,7 +152,7 @@ func DeletePayment(payment *Payment) (bool, error) {
return affected != 0, nil
}
func notifyPayment(request *http.Request, body []byte, owner string, paymentName string) (*Payment, *pp.NotifyResult, error) {
func notifyPayment(body []byte, owner string, paymentName string) (*Payment, *pp.NotifyResult, error) {
payment, err := getPayment(owner, paymentName)
if err != nil {
return nil, nil, err
@ -167,7 +166,7 @@ func notifyPayment(request *http.Request, body []byte, owner string, paymentName
if err != nil {
return nil, nil, err
}
pProvider, cert, err := provider.getPaymentProvider()
pProvider, err := GetPaymentProvider(provider)
if err != nil {
return nil, nil, err
}
@ -181,7 +180,7 @@ func notifyPayment(request *http.Request, body []byte, owner string, paymentName
return nil, nil, err
}
notifyResult, err := pProvider.Notify(request, body, cert.AuthorityPublicKey, payment.OutOrderId)
notifyResult, err := pProvider.Notify(body, payment.OutOrderId)
if err != nil {
return payment, nil, err
}
@ -202,8 +201,8 @@ func notifyPayment(request *http.Request, body []byte, owner string, paymentName
return payment, notifyResult, nil
}
func NotifyPayment(request *http.Request, body []byte, owner string, paymentName string) (*Payment, error) {
payment, notifyResult, err := notifyPayment(request, body, owner, paymentName)
func NotifyPayment(body []byte, owner string, paymentName string) (*Payment, error) {
payment, notifyResult, err := notifyPayment(body, owner, paymentName)
if payment != nil {
if err != nil {
payment.State = pp.PaymentStateError
@ -231,7 +230,7 @@ func invoicePayment(payment *Payment) (string, error) {
return "", fmt.Errorf("the payment provider: %s does not exist", payment.Provider)
}
pProvider, _, err := provider.getPaymentProvider()
pProvider, err := GetPaymentProvider(provider)
if err != nil {
return "", err
}