a
This commit is contained in:
@@ -118,10 +118,16 @@ func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toT
|
|||||||
return pagedInfo, err
|
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) {
|
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
|
var orders []*model.Order
|
||||||
sql := `
|
sql := `
|
||||||
SELECT SQL_CALC_FOUND_ROWS a.*
|
SELECT SQL_CALC_FOUND_ROWS a.*, b.name user_name, b.mobile
|
||||||
FROM ` + "`order`" + ` a
|
FROM ` + "`order`" + ` a
|
||||||
JOIN user b ON b.user_id = a.user_id AND b.deleted_at = ?
|
JOIN user b ON b.user_id = a.user_id AND b.deleted_at = ?
|
||||||
WHERE 1 = 1
|
WHERE 1 = 1
|
||||||
|
|||||||
Reference in New Issue
Block a user