diff --git a/service/repositories/order.go b/service/repositories/order.go index 38b783dc..4572f1e7 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -219,7 +219,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess tradeSn = charge.ID payAmount = charge.Amount 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 { var orderInfo gmodel.FsOrder @@ -311,11 +311,16 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess 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 { status = ress.OrderDetail.OrderInfo.Status 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) uOrderDetail["order_amount"] = struct {