|
|
@@ -57,7 +57,7 @@ func GetTopUpByTradeNo(tradeNo string) *TopUp {
|
|
|
return topUp
|
|
|
}
|
|
|
|
|
|
-func Recharge(referenceId string, customerId string) (err error) {
|
|
|
+func Recharge(referenceId string, customerId string, callerIp string) (err error) {
|
|
|
if referenceId == "" {
|
|
|
return errors.New("未提供支付单号")
|
|
|
}
|
|
|
@@ -105,7 +105,7 @@ func Recharge(referenceId string, customerId string) (err error) {
|
|
|
return errors.New("充值失败,请稍后重试")
|
|
|
}
|
|
|
|
|
|
- RecordLog(topUp.UserId, LogTypeTopup, fmt.Sprintf("使用在线充值成功,充值金额: %v,支付金额:%d", logger.FormatQuota(int(quota)), topUp.Amount))
|
|
|
+ RecordTopupLog(topUp.UserId, fmt.Sprintf("使用在线充值成功,充值金额: %v,支付金额:%d", logger.FormatQuota(int(quota)), topUp.Amount), callerIp, topUp.PaymentMethod, "stripe")
|
|
|
|
|
|
return nil
|
|
|
}
|
|
|
@@ -242,7 +242,7 @@ func SearchAllTopUps(keyword string, pageInfo *common.PageInfo) (topups []*TopUp
|
|
|
}
|
|
|
|
|
|
// ManualCompleteTopUp 管理员手动完成订单并给用户充值
|
|
|
-func ManualCompleteTopUp(tradeNo string) error {
|
|
|
+func ManualCompleteTopUp(tradeNo string, callerIp string) error {
|
|
|
if tradeNo == "" {
|
|
|
return errors.New("未提供订单号")
|
|
|
}
|
|
|
@@ -255,6 +255,7 @@ func ManualCompleteTopUp(tradeNo string) error {
|
|
|
var userId int
|
|
|
var quotaToAdd int
|
|
|
var payMoney float64
|
|
|
+ var paymentMethod string
|
|
|
|
|
|
err := DB.Transaction(func(tx *gorm.DB) error {
|
|
|
topUp := &TopUp{}
|
|
|
@@ -301,6 +302,7 @@ func ManualCompleteTopUp(tradeNo string) error {
|
|
|
|
|
|
userId = topUp.UserId
|
|
|
payMoney = topUp.Money
|
|
|
+ paymentMethod = topUp.PaymentMethod
|
|
|
return nil
|
|
|
})
|
|
|
|
|
|
@@ -309,10 +311,10 @@ func ManualCompleteTopUp(tradeNo string) error {
|
|
|
}
|
|
|
|
|
|
// 事务外记录日志,避免阻塞
|
|
|
- RecordLog(userId, LogTypeTopup, fmt.Sprintf("管理员补单成功,充值金额: %v,支付金额:%f", logger.FormatQuota(quotaToAdd), payMoney))
|
|
|
+ RecordTopupLog(userId, fmt.Sprintf("管理员补单成功,充值金额: %v,支付金额:%f", logger.FormatQuota(quotaToAdd), payMoney), callerIp, paymentMethod, "admin")
|
|
|
return nil
|
|
|
}
|
|
|
-func RechargeCreem(referenceId string, customerEmail string, customerName string) (err error) {
|
|
|
+func RechargeCreem(referenceId string, customerEmail string, customerName string, callerIp string) (err error) {
|
|
|
if referenceId == "" {
|
|
|
return errors.New("未提供支付单号")
|
|
|
}
|
|
|
@@ -382,12 +384,12 @@ func RechargeCreem(referenceId string, customerEmail string, customerName string
|
|
|
return errors.New("充值失败,请稍后重试")
|
|
|
}
|
|
|
|
|
|
- RecordLog(topUp.UserId, LogTypeTopup, fmt.Sprintf("使用Creem充值成功,充值额度: %v,支付金额:%.2f", quota, topUp.Money))
|
|
|
+ RecordTopupLog(topUp.UserId, fmt.Sprintf("使用Creem充值成功,充值额度: %v,支付金额:%.2f", quota, topUp.Money), callerIp, topUp.PaymentMethod, "creem")
|
|
|
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func RechargeWaffo(tradeNo string) (err error) {
|
|
|
+func RechargeWaffo(tradeNo string, callerIp string) (err error) {
|
|
|
if tradeNo == "" {
|
|
|
return errors.New("未提供支付单号")
|
|
|
}
|
|
|
@@ -444,7 +446,7 @@ func RechargeWaffo(tradeNo string) (err error) {
|
|
|
}
|
|
|
|
|
|
if quotaToAdd > 0 {
|
|
|
- RecordLog(topUp.UserId, LogTypeTopup, fmt.Sprintf("Waffo充值成功,充值额度: %v,支付金额: %.2f", logger.FormatQuota(quotaToAdd), topUp.Money))
|
|
|
+ RecordTopupLog(topUp.UserId, fmt.Sprintf("Waffo充值成功,充值额度: %v,支付金额: %.2f", logger.FormatQuota(quotaToAdd), topUp.Money), callerIp, topUp.PaymentMethod, "waffo")
|
|
|
}
|
|
|
|
|
|
return nil
|