|
@@ -379,8 +379,11 @@ func (this *OrderController) TradeOrderList() {
|
|
|
PaymentWay: PaymentWayMap[order.PaymentWay],
|
|
|
PaymentAccount: order.PaymentAccount,
|
|
|
MerchantID: order.MerchantId,
|
|
|
- DealTime: order.DealTime.Format(time.DateTime),
|
|
|
- CreatedTime: order.CreatedTime.Format(time.DateTime),
|
|
|
+
|
|
|
+ CreatedTime: order.CreatedTime.Format(time.DateTime),
|
|
|
+ }
|
|
|
+ if order.PaymentStatus == models.PaymentStatusDone {
|
|
|
+ view.DealTime = order.DealTime.Format(time.DateTime)
|
|
|
}
|
|
|
if IsRefund {
|
|
|
view.PaymentStatus = RefundOrderStatus[order.PaymentStatus]
|
|
@@ -659,9 +662,11 @@ func (this *OrderController) ExportTradeOrder() {
|
|
|
PaymentWay: PaymentWayMap[order.PaymentWay],
|
|
|
PaymentAccount: order.PaymentAccount,
|
|
|
MerchantID: order.MerchantId,
|
|
|
- DealTime: order.DealTime.Format(time.DateTime),
|
|
|
CreatedTime: order.CreatedTime.Format(time.DateTime),
|
|
|
}
|
|
|
+ if order.PaymentStatus == models.PaymentStatusDone {
|
|
|
+ view.DealTime = order.DealTime.Format(time.DateTime)
|
|
|
+ }
|
|
|
if IsRefund {
|
|
|
view.PaymentStatus = RefundOrderStatus[order.PaymentStatus]
|
|
|
} else {
|