xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-11-09 18:53:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change payment component, upgrade golang to 1.22.4

Browse Source
This commit is contained in:
RockYang
2024-06-11 11:48:41 +08:00
parent b8de15d66e
commit ccad7e7bb5
6 changed files with 128 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/handler/payment_handler.go
View File

@@ -110,11 +110,9 @@ func (h *PaymentHandler) DoPay(c *gin.Context) {
h.DB.Model(&order).UpdateColumn("status", types.OrderScanned)
if payWay == "alipay" { // 支付宝
// 生成支付链接
notifyURL := h.App.Config.AlipayConfig.NotifyURL
returnURL := "" // 关闭同步回跳
amount := fmt.Sprintf("%.2f", order.Amount)
uri, err := h.alipayService.PayUrlMobile(order.OrderNo, notifyURL, returnURL, amount, order.Subject)
uri, err := h.alipayService.PayUrlMobile(order.OrderNo, amount, order.Subject)
if err != nil {
resp.ERROR(c, "error with generate pay url: "+err.Error())
return
@@ -377,9 +375,7 @@ func (h *PaymentHandler) Mobile(c *gin.Context) {
payURL = h.js.PayH5(params)
case "alipay":
payWay = PayWayAlipay
notifyURL = h.App.Config.AlipayConfig.NotifyURL
returnURL = h.App.Config.AlipayConfig.ReturnURL
payURL, err = h.alipayService.PayUrlMobile(orderNo, notifyURL, returnURL, fmt.Sprintf("%.2f", amount), product.Name)
payURL, err = h.alipayService.PayUrlMobile(orderNo, fmt.Sprintf("%.2f", amount), product.Name)
if err != nil {
resp.ERROR(c, "error with generating Pay URL: "+err.Error())
return
@@ -560,7 +556,7 @@ func (h *PaymentHandler) AlipayNotify(c *gin.Context) {
}
// TODO：验证交易签名
res := h.alipayService.TradeVerify(c.Request.Form)
res := h.alipayService.TradeVerify(c.Request)
logger.Infof("验证支付结果：%+v", res)
if !res.Success() {
logger.Error("订单校验失败：", res.Message)