fix:支付
This commit is contained in:
parent
ee6e31473e
commit
8d3fce919f
|
@ -219,7 +219,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
||||||
tradeSn = charge.ID
|
tradeSn = charge.ID
|
||||||
payAmount = charge.Amount
|
payAmount = charge.Amount
|
||||||
payTitle = charge.Description
|
payTitle = charge.Description
|
||||||
payTime = time.Unix(charge.Created, 0)
|
payTime = time.Unix(charge.Created, 0).UTC()
|
||||||
}
|
}
|
||||||
err = d.MysqlConn.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
err = d.MysqlConn.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||||
var orderInfo gmodel.FsOrder
|
var orderInfo gmodel.FsOrder
|
||||||
|
@ -311,11 +311,16 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
||||||
ress.OrderDetail.OrderInfo.StatusLink[oStatusLinkKey].Children = statusChildren
|
ress.OrderDetail.OrderInfo.StatusLink[oStatusLinkKey].Children = statusChildren
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
statusLink = ress.OrderDetail.OrderInfo.StatusLink
|
||||||
|
|
||||||
if ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDERSTATUSDIRECTMAILORDERED || ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDERSTATUSCLOUDSTOREORDERED {
|
if ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDERSTATUSDIRECTMAILORDERED || ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDERSTATUSCLOUDSTOREORDERED {
|
||||||
status = ress.OrderDetail.OrderInfo.Status
|
status = ress.OrderDetail.OrderInfo.Status
|
||||||
status.Children = statusChildren
|
status.Children = statusChildren
|
||||||
}
|
}
|
||||||
|
payInfo.Status = gmodel.PayStatus{
|
||||||
|
StatusCode: int64(constants.PAYSTATUSPAID),
|
||||||
|
StatusTitle: constants.PayStatusMessage[constants.PAYSTATUSPAID],
|
||||||
|
}
|
||||||
|
|
||||||
payInfo.StatusLink = append(ress.OrderDetail.OrderAmount.RemainingBalance.StatusLink, payInfo.Status)
|
payInfo.StatusLink = append(ress.OrderDetail.OrderAmount.RemainingBalance.StatusLink, payInfo.Status)
|
||||||
uOrderDetail["order_amount"] = struct {
|
uOrderDetail["order_amount"] = struct {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user