|
@@ -146,14 +146,14 @@ func convertProductOrderDetailDTO(order orderDao.ProductOrder) (orderDetailDTO P
|
|
Mobile: order.Mobile,
|
|
Mobile: order.Mobile,
|
|
RealName: order.RealName,
|
|
RealName: order.RealName,
|
|
},
|
|
},
|
|
- TransactionID: order.TradeID,
|
|
|
|
- PaymentTime: order.PaymentTime.Format(time.DateTime),
|
|
|
|
- RefundStatus: string(order.RefundStatus),
|
|
|
|
- RefundFinishTime: order.RefundFinishTime.Format(time.DateTime),
|
|
|
|
- Remark: order.Remark,
|
|
|
|
|
|
+ TransactionID: order.TradeID,
|
|
|
|
+ RefundStatus: string(order.RefundStatus),
|
|
|
|
+ Remark: order.Remark,
|
|
}
|
|
}
|
|
if order.Status == orderDao.OrderStatusRefund {
|
|
if order.Status == orderDao.OrderStatusRefund {
|
|
- //orderDetailDTO.Status = string(order.RefundStatus)
|
|
|
|
|
|
+ if order.RefundStatus == orderDao.RefundStatusSuccess {
|
|
|
|
+ orderDetailDTO.RefundFinishTime = order.RefundFinishTime.Format(time.DateTime)
|
|
|
|
+ }
|
|
orderDetailDTO.StatusCN = transRefundStatusMap[order.RefundStatus]
|
|
orderDetailDTO.StatusCN = transRefundStatusMap[order.RefundStatus]
|
|
}
|
|
}
|
|
if order.Status == orderDao.OrderStatusPending {
|
|
if order.Status == orderDao.OrderStatusPending {
|
|
@@ -177,7 +177,9 @@ func convertProductOrderDetailDTO(order orderDao.ProductOrder) (orderDetailDTO P
|
|
} else {
|
|
} else {
|
|
orderDetailDTO.ValidDuration = fmt.Sprintf("%s~%s", access.BeginDate, access.EndDate)
|
|
orderDetailDTO.ValidDuration = fmt.Sprintf("%s~%s", access.BeginDate, access.EndDate)
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ }
|
|
|
|
+ if order.TradeNO != "" {
|
|
|
|
+ orderDetailDTO.PaymentTime = order.PaymentTime.Format(time.DateTime)
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|