github/new-api
1
0
Fork 0
mirror of https://github.com/QuantumNous/new-api.git synced 2026-03-30 10:34:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sub' into feature/subscription

Browse Source
This commit is contained in:
t0ng7u
2026-02-03 00:24:16 +08:00
parent 414f86fb4b 49ac355357
commit 2cdc37fdc4
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
controller/subscription_payment_epay.go
View File

@@ -77,7 +77,7 @@ func SubscriptionRequestEpay(c *gin.Context) {
client := GetEpayClient()
if client == nil {
c.JSON(http.StatusOK, gin.H{"message": "error", "data": "当前管理员未配置支付信息"})
common.ApiErrorMsg(c, "当前管理员未配置支付信息")
return
}
@@ -91,7 +91,7 @@ func SubscriptionRequestEpay(c *gin.Context) {
ReturnUrl: returnUrl,
})
if err != nil {
c.JSON(http.StatusOK, gin.H{"message": "error", "data": "拉起支付失败"})
common.ApiErrorMsg(c, "拉起支付失败")
return
}
@@ -105,7 +105,7 @@ func SubscriptionRequestEpay(c *gin.Context) {
Status: common.TopUpStatusPending,
}
if err := order.Insert(); err != nil {
c.JSON(http.StatusOK, gin.H{"message": "error", "data": "创建订单失败"})
common.ApiErrorMsg(c, "创建订单失败")
return
}
c.JSON(http.StatusOK, gin.H{"message": "success", "data": params, "url": uri})
@@ -128,14 +128,17 @@ func SubscriptionEpayNotify(c *gin.Context) {
return
}
if verifyInfo.TradeStatus == epay.StatusTradeSuccess {
LockOrder(verifyInfo.ServiceTradeNo)
defer UnlockOrder(verifyInfo.ServiceTradeNo)
if verifyInfo.TradeStatus != epay.StatusTradeSuccess {
_, _ = c.Writer.Write([]byte("fail"))
return
}
if err := model.CompleteSubscriptionOrder(verifyInfo.ServiceTradeNo, common.GetJsonString(verifyInfo)); err != nil {
_, _ = c.Writer.Write([]byte("fail"))
return
}
LockOrder(verifyInfo.ServiceTradeNo)
defer UnlockOrder(verifyInfo.ServiceTradeNo)
if err := model.CompleteSubscriptionOrder(verifyInfo.ServiceTradeNo, common.GetJsonString(verifyInfo)); err != nil {
_, _ = c.Writer.Write([]byte("fail"))
return
}
_, _ = c.Writer.Write([]byte("success"))