Sfoglia il codice sorgente

修复支付订单bug

kobe6258 5 mesi fa
parent
commit
2e8ca7c835
1 ha cambiato i file con 9 aggiunte e 7 eliminazioni
  1. 9 7
      domian/order/product_order.go

+ 9 - 7
domian/order/product_order.go

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