llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-04 05:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix NotifyPayment().

Browse Source
This commit is contained in:
Yang Luo
2022-03-13 19:57:23 +08:00
parent 55a84644e1
commit fde8c4b5f6
5 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
object/payment.go
View File

@ -44,6 +44,7 @@ type Payment struct {
PayUrl string `xorm:"varchar(2000)" json:"payUrl"`
ReturnUrl string `xorm:"varchar(1000)" json:"returnUrl"`
State string `xorm:"varchar(100)" json:"state"`
Message string `xorm:"varchar(1000)" json:"message"`
}
func GetPaymentCount(owner, field, value string) int {
@ -142,7 +143,7 @@ func DeletePayment(payment *Payment) bool {
return affected != 0
}
func NotifyPayment(bm gopay.BodyMap) bool {
func notifyPayment(bm gopay.BodyMap) (*Payment, error) {
owner := "admin"
productName := bm.Get("subject")
paymentId := bm.Get("out_trade_no")
@ -153,52 +154,60 @@ func NotifyPayment(bm gopay.BodyMap) bool {
product := getProduct(owner, productId)
if product == nil {
panic(fmt.Errorf("the product: %s does not exist", productId))
return nil, fmt.Errorf("the product: %s does not exist", productId)
}
if productName != product.DisplayName {
panic(fmt.Errorf("the payment's product name: %s doesn't equal to the expected product name: %s", productName, product.DisplayName))
return nil, fmt.Errorf("the payment's product name: %s doesn't equal to the expected product name: %s", productName, product.DisplayName)
}
if price != product.Price {
panic(fmt.Errorf("the payment's price: %f doesn't equal to the expected price: %f", price, product.Price))
return nil, fmt.Errorf("the payment's price: %f doesn't equal to the expected price: %f", price, product.Price)
}
payment := getPayment(owner, paymentId)
if payment == nil {
panic(fmt.Errorf("the payment: %s does not exist", paymentId))
return nil, fmt.Errorf("the payment: %s does not exist", paymentId)
}
provider, err := product.getProvider(providerId)
if err != nil {
panic(err)
return payment, err
}
cert := getCert(owner, provider.Cert)
if cert == nil {
panic(fmt.Errorf("the cert: %s does not exist", provider.Cert))
return payment, fmt.Errorf("the cert: %s does not exist", provider.Cert)
}
ok, err := alipay.VerifySignWithCert(cert.AuthorityPublicKey, bm)
if err != nil {
panic(err)
return payment, err
}
if ok {
payment.State = "Paid"
} else {
if cert == nil {
panic(fmt.Errorf("VerifySignWithCert() failed: %v", ok))
if !ok {
return payment, fmt.Errorf("VerifySignWithCert() failed: %v", ok)
}
return payment, nil
}
func NotifyPayment(bm gopay.BodyMap) bool {
payment, err := notifyPayment(bm)
if payment != nil {
if err != nil {
payment.State = "Error"
payment.Message = err.Error()
} else {
payment.State = "Paid"
}
//payment.State = "Failed"
UpdatePayment(payment.GetId(), payment)
}
affected, err := adapter.Engine.ID(core.PK{owner, paymentId}).AllCols().Update(payment)
if err != nil {
panic(err)
}
return affected != 0
ok := err == nil
return ok
}
func (payment *Payment) GetId() string {

2
object/product.go
View File

@ -179,7 +179,7 @@ func BuyProduct(id string, providerId string, user *User, host string) (string,
productId := product.Name
originFrontend, originBackend := getOriginFromHost(host)
returnUrl := fmt.Sprintf("%s/payments/%s", originFrontend, paymentId)
returnUrl := fmt.Sprintf("%s/payments/%s/result", originFrontend, paymentId)
notifyUrl := fmt.Sprintf("%s/api/notify-payment", originBackend)
payUrl, err := pProvider.Pay(productName, productId, providerId, paymentId, product.Price, returnUrl, notifyUrl)