From 5f0cf841ede00563f6c8cfb13321c989044b9513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 10 Nov 2020 14:33:54 +0800
Subject: [PATCH] deilifveinfo

---
 business/model/dao/dao_order.go | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 984628a2f..e9e1c0c04 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -40,8 +40,14 @@ func GetDeliveryOrdersNoPage(db *DaoDB, userIDs []string, statuss []int, fromTim
 	return dOrders, err
 }
 
+type GetDeliveryOrdersResult struct {
+	model.DeliveryOrder
+	DeliverySendInfo    *UserDeliveryAddressEx `json:"deliverySendInfo"`
+	DeliveryReceiveInfo *UserDeliveryAddressEx `json:"deliveryReceiveInfo"`
+}
+
 func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toTime time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
-	var dOrders []*model.DeliveryOrder
+	var dOrders []*GetDeliveryOrdersResult
 	sql := `
 		SELECT SQL_CALC_FOUND_ROWS a.*
 		  FROM delivery_order a
@@ -72,8 +78,17 @@ func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toT
 	if err = GetRows(db, &dOrders, sql, sqlParams...); err == nil {
 		pagedInfo = &model.PagedInfo{
 			TotalCount: GetLastTotalRowCount(db),
-			Data:       dOrders,
+			// Data:       dOrders,
 		}
+		for _, v := range dOrders {
+			if addressList1, _, err := QueryUserDeliveryAddress(db, int64(v.DeliverySendID), nil, 0, 0, 0); err == nil && len(addressList1) > 0 {
+				v.DeliverySendInfo = addressList1[0]
+			}
+			if addressList2, _, err := QueryUserDeliveryAddress(db, int64(v.DeliveryReceiveID), nil, 0, 0, 0); err == nil && len(addressList2) > 0 {
+				v.DeliveryReceiveInfo = addressList2[0]
+			}
+		}
+		pagedInfo.Data = dOrders
 	}
 	return pagedInfo, err
 }