- fix bug when get OrderManager.GetOrders when orderID given
This commit is contained in:
@@ -258,17 +258,23 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
|
|||||||
FROM goods_order t1
|
FROM goods_order t1
|
||||||
LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id
|
LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id
|
||||||
`
|
`
|
||||||
sqlWhere := `
|
var (
|
||||||
WHERE t1.order_created_at >= ? AND t1.order_created_at < ?
|
sqlWhere string
|
||||||
`
|
sqlParams []interface{}
|
||||||
sqlParams := []interface{}{
|
)
|
||||||
fromDate,
|
|
||||||
toDate,
|
|
||||||
}
|
|
||||||
if params["orderID"] != nil {
|
if params["orderID"] != nil {
|
||||||
sqlWhere += " AND t1.vendor_order_id = ?"
|
sqlWhere = " WHERE t1.vendor_order_id = ?"
|
||||||
sqlParams = append(sqlParams, params["orderID"].(string))
|
sqlParams = []interface{}{
|
||||||
|
params["orderID"].(string),
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
sqlWhere = `
|
||||||
|
WHERE t1.order_created_at >= ? AND t1.order_created_at < ?
|
||||||
|
`
|
||||||
|
sqlParams = []interface{}{
|
||||||
|
fromDate,
|
||||||
|
toDate,
|
||||||
|
}
|
||||||
if params["keyword"] != nil {
|
if params["keyword"] != nil {
|
||||||
keyword := params["keyword"].(string)
|
keyword := params["keyword"].(string)
|
||||||
keywordLike := "%" + keyword + "%"
|
keywordLike := "%" + keyword + "%"
|
||||||
|
|||||||
Reference in New Issue
Block a user