fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:支付

Browse Source
This commit is contained in:
momo 2023-09-28 10:05:55 +08:00
parent 7573f9ccf6
commit b7a41d39e3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
service/repositories/order.go
View File

@ -45,7 +45,8 @@ type (
} }
PayInfo struct { PayInfo struct {
PayMethod string `json:"pay_method"` // 交易方式 PayMethod string `json:"pay_method"` // 支付方式
PaymentMethod string `json:"payment_method"` // 交易方式
PayTime time.Time `json:"pay_time"` // 支付时间 PayTime time.Time `json:"pay_time"` // 支付时间
Status gmodel.PayStatus `json:"status"` // 当前状态 Status gmodel.PayStatus `json:"status"` // 当前状态
StatusLink []gmodel.PayStatus `json:"status_link"` // 状态链路 StatusLink []gmodel.PayStatus `json:"status_link"` // 状态链路
@ -182,13 +183,14 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
var payAmount int64 var payAmount int64
var payTitle string var payTitle string
var payTime time.Time var payTime time.Time
var paymentMethod string
var paymentMethod int64 = 1 var payMethod int64 = 1
if in.PaymentMethod == "stripe" { if in.PaymentMethod == "stripe" {
paymentMethod = 1 payMethod = 1
} }
if in.PaymentMethod == "paypal" { if in.PaymentMethod == "paypal" {
paymentMethod = 2 payMethod = 2
} }
if in.Charge != nil { if in.Charge != nil {
@ -220,6 +222,9 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
brand = string(charge.PaymentMethodDetails.Card.Brand) brand = string(charge.PaymentMethodDetails.Card.Brand)
} }
} }
if charge.PaymentMethodDetails.Type != "" {
paymentMethod = string(charge.PaymentMethodDetails.Type)
}
} }
if charge.Currency != "" { if charge.Currency != "" {
currency = string(charge.Currency) currency = string(charge.Currency)
@ -253,7 +258,8 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
var payStatusLink []gmodel.PayStatus var payStatusLink []gmodel.PayStatus
var orderAmount = make(map[string]interface{}) var orderAmount = make(map[string]interface{})
var payInfo PayInfo var payInfo PayInfo
payInfo.PayMethod = in.PaymentMethod payInfo.PayMethod = paymentMethod
payInfo.PaymentMethod = in.PaymentMethod
payInfo.PayTime = payTime payInfo.PayTime = payTime
payInfo.TradeNo = tradeSn payInfo.TradeNo = tradeSn
// 当前状态 // 当前状态
@ -362,7 +368,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
TradeSn: &tradeSn, TradeSn: &tradeSn,
PayAmount: &payAmount, PayAmount: &payAmount,
PayStatus: &payStatus, PayStatus: &payStatus,
PaymentMethod: &paymentMethod, PaymentMethod: &payMethod,
PayStage: &payStageInt, PayStage: &payStageInt,
CardSn: &card, CardSn: &card,
CardBrand: &brand, CardBrand: &brand,