diff --git a/controller/topup.go b/controller/topup.go index d17cad4..35e6b97 100644 --- a/controller/topup.go +++ b/controller/topup.go @@ -98,7 +98,7 @@ func RequestEpay(c *gin.Context) { topUp := &model.TopUp{ UserId: id, Amount: req.Amount, - Money: int(amount), + Money: payMoney, TradeNo: "A" + tradeNo, CreateTime: time.Now().Unix(), Status: "pending", @@ -175,5 +175,6 @@ func RequestAmount(c *gin.Context) { } id := c.GetInt("id") user, _ := model.GetUserById(id, false) - c.JSON(200, gin.H{"message": "success", "data": GetAmount(float64(req.Amount), *user)}) + payMoney := GetAmount(float64(req.Amount), *user) + c.JSON(200, gin.H{"message": "success", "data": strconv.FormatFloat(payMoney, 'f', 2, 64)}) } diff --git a/model/topup.go b/model/topup.go index 876cd23..dc1cbc5 100644 --- a/model/topup.go +++ b/model/topup.go @@ -1,13 +1,13 @@ package model type TopUp struct { - Id int `json:"id"` - UserId int `json:"user_id" gorm:"index"` - Amount int `json:"amount"` - Money int `json:"money"` - TradeNo string `json:"trade_no"` - CreateTime int64 `json:"create_time"` - Status string `json:"status"` + Id int `json:"id"` + UserId int `json:"user_id" gorm:"index"` + Amount int `json:"amount"` + Money float64 `json:"money"` + TradeNo string `json:"trade_no"` + CreateTime int64 `json:"create_time"` + Status string `json:"status"` } func (topUp *TopUp) Insert() error {