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