From 1ad60d560f4438bebf70cdcf17ea12c3ee8b37d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 16 Dec 2020 09:20:21 +0800
Subject: [PATCH] a

---
 business/model/dao/dao_order.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 971045c16..c9ba9cac5 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -118,10 +118,16 @@ func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toT
 	return pagedInfo, err
 }
 
+type GetOrdersResult struct {
+	model.Order
+	UserName string `json:"userName"`
+	Mobile   string `json:"mobile"`
+}
+
 func GetOrders(db *DaoDB, orderID, userID string, orderType int, cityCodes []int, fromTime, toTime time.Time, keyword string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	var orders []*model.Order
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS a.* 
+		SELECT SQL_CALC_FOUND_ROWS a.*, b.name user_name, b.mobile
 		  FROM ` + "`order`" + ` a
 		  JOIN user b ON b.user_id = a.user_id AND b.deleted_at = ? 
 		 WHERE 1 = 1