liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- order/GetOrders new param:orderID

Browse Source
This commit is contained in:
gazebo
2019-01-28 15:05:48 +08:00
parent 3787eabfc3
commit a7167de7bf
2 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/orderman_ext.go
View File

@@ -309,6 +309,10 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
fromDate, fromDate,
toDate, toDate,
} }
if params["orderID"] != nil {
sqlWhere += " AND t1.vendor_order_id = ?"
sqlParams = append(sqlParams, params["orderID"].(string))
} else {
if params["keyword"] != nil { if params["keyword"] != nil {
keyword := params["keyword"].(string) keyword := params["keyword"].(string)
keywordLike := "%" + keyword + "%" keywordLike := "%" + keyword + "%"
@@ -376,7 +380,7 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
sqlParams = append(sqlParams, cities) sqlParams = append(sqlParams, cities)
} }
} }
}
sql += sqlWhere sql += sqlWhere
sql += ` sql += `
ORDER BY t1.order_created_at DESC ORDER BY t1.order_created_at DESC

1
controllers/jx_order.go
View File

@@ -200,6 +200,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Title 查询订单 // @Title 查询订单
// @Description 查询订单 // @Description 查询订单
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param orderID query string false "订单号，如果此项不为空，忽略其它所有查询条件"
// @Param keyword query string false "查询关键字" // @Param keyword query string false "查询关键字"
// @Param fromDate query string true "开始日期（包含），格式（2006-01-02）" // @Param fromDate query string true "开始日期（包含），格式（2006-01-02）"
// @Param toDate query string false "结束日期（包含），格式（2006-01-02）" // @Param toDate query string false "结束日期（包含），格式（2006-01-02）"