|
@@ -367,14 +367,10 @@ func (this *OrderController) TradeOrderList() {
|
|
|
for i := 0; i < len(List); i++ {
|
|
|
go func(order *models.TradeOrder) {
|
|
|
defer wg.Done()
|
|
|
- productOrder, pdErr := models.GetProductOrderByID(order.ProductOrderId)
|
|
|
- if pdErr != nil {
|
|
|
- utils.FileLog.Error("获取商品订单信息失败,Err:" + pdErr.Error())
|
|
|
- }
|
|
|
view := &models.TradeOrderView{
|
|
|
- RealName: productOrder.RealName,
|
|
|
- Mobile: fmt.Sprintf("+%s %s", productOrder.AreaCode, productOrder.Mobile),
|
|
|
- ProductName: productOrder.ProductName,
|
|
|
+ RealName: order.RealName,
|
|
|
+ Mobile: fmt.Sprintf("+%s %s", order.AreaCode, order.Mobile),
|
|
|
+ ProductName: order.ProductName,
|
|
|
Amount: fmt.Sprintf("¥%s", order.Amount),
|
|
|
TransactionID: order.TransactionId,
|
|
|
ProductOrderID: order.ProductOrderId,
|
|
@@ -650,14 +646,10 @@ func (this *OrderController) ExportTradeOrder() {
|
|
|
for i := 0; i < len(List); i++ {
|
|
|
go func(order *models.TradeOrder) {
|
|
|
defer wg.Done()
|
|
|
- productOrder, pdErr := models.GetProductOrderByID(order.ProductOrderId)
|
|
|
- if pdErr != nil {
|
|
|
- utils.FileLog.Error("获取商品订单信息失败,Err:" + pdErr.Error())
|
|
|
- }
|
|
|
view := models.TradeOrderView{
|
|
|
- RealName: productOrder.RealName,
|
|
|
- Mobile: fmt.Sprintf("+%s %s", productOrder.AreaCode, productOrder.Mobile),
|
|
|
- ProductName: productOrder.ProductName,
|
|
|
+ RealName: order.RealName,
|
|
|
+ Mobile: fmt.Sprintf("+%s %s", order.AreaCode, order.Mobile),
|
|
|
+ ProductName: order.ProductName,
|
|
|
Amount: fmt.Sprintf("¥%s", order.Amount),
|
|
|
TransactionID: order.TransactionId,
|
|
|
ProductOrderID: order.ProductOrderId,
|