From 5d0d268c975a68108c3ba1256c29c3dd289ac25d Mon Sep 17 00:00:00 2001
From: CalciumIon <1808837298@qq.com>
Date: Sun, 4 Aug 2024 00:17:48 +0800
Subject: [PATCH] fix: epay

---
 controller/topup.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/controller/topup.go b/controller/topup.go
index dc1e265..995f412 100644
--- a/controller/topup.go
+++ b/controller/topup.go
@@ -94,6 +94,7 @@ func RequestEpay(c *gin.Context) {
 	returnUrl, _ := url.Parse(constant.ServerAddress + "/log")
 	notifyUrl, _ := url.Parse(callBackAddress + "/api/user/epay/notify")
 	tradeNo := fmt.Sprintf("%s%d", common.GetRandomString(6), time.Now().Unix())
+	tradeNo = fmt.Sprintf("USR%dNO%s", id, tradeNo)
 	client := GetEpayClient()
 	if client == nil {
 		c.JSON(200, gin.H{"message": "error", "data": "当前管理员未配置支付信息"})
@@ -101,7 +102,7 @@ func RequestEpay(c *gin.Context) {
 	}
 	uri, params, err := client.Purchase(&epay.PurchaseArgs{
 		Type:           payType,
-		ServiceTradeNo: fmt.Sprintf("USR%d-%s", id, tradeNo),
+		ServiceTradeNo: tradeNo,
 		Name:           fmt.Sprintf("TUC%d", req.Amount),
 		Money:          strconv.FormatFloat(payMoney, 'f', 2, 64),
 		Device:         epay.PC,
@@ -120,7 +121,7 @@ func RequestEpay(c *gin.Context) {
 		UserId:     id,
 		Amount:     amount,
 		Money:      payMoney,
-		TradeNo:    "A" + tradeNo,
+		TradeNo:    tradeNo,
 		CreateTime: time.Now().Unix(),
 		Status:     "pending",
 	}