Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

This commit is contained in:
laodaming 2023-10-30 18:07:02 +08:00
commit fd53f078ae

View File

@ -1754,7 +1754,10 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
orderDetail.OrderAmount.Subtotal = order.GetAmountInfoFormat(&orderAmount.Subtotal, true)
orderDetail.OrderAmount.Total = order.GetAmountInfoFormat(&orderAmount.Total, true)
orderDetail.PayStatus = constants.OrderPayStatusCode(*orderInfo.PayStatus)
orderDetail.PayTimeout = time.Duration(orderInfo.Ctime.Add(30*time.Minute).UTC().Unix() - time.Now().UTC().Unix())
if *orderInfo.PayStatus == int64(constants.ORDER_STATUS_UNPAIDDEPOSIT) {
orderDetail.PayTimeout = time.Duration(orderInfo.Ctime.Add(30*time.Minute).UTC().Unix() - time.Now().UTC().Unix())
}
orderDetail.OrderInfo = gmodel.OrderInfo{
UserId: *orderInfo.UserId,
DeliveryMethod: *orderInfo.DeliveryMethod,