- order/GetOrders new param:orderID

business/jxcallback/orderman/orderman_ext.go

@@ -309,74 +309,78 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
 		fromDate,
 		toDate,
 	}
-	if params["keyword"] != nil {
+	if params["orderID"] != nil {
-		keyword := params["keyword"].(string)
+		sqlWhere += " AND t1.vendor_order_id = ?"
-		keywordLike := "%" + keyword + "%"
+		sqlParams = append(sqlParams, params["orderID"].(string))
-		sqlWhere += `
+	} else {
+		if params["keyword"] != nil {
+			keyword := params["keyword"].(string)
+			keywordLike := "%" + keyword + "%"
+			sqlWhere += `
 		AND (t1.store_name LIKE ? OR t1.vendor_order_id LIKE ? OR t1.vendor_store_id LIKE ?
 			OR t1.consignee_name LIKE ? OR t1.consignee_mobile LIKE ? OR t1.consignee_mobile2 LIKE ? OR t1.consignee_address LIKE ?
 			OR t2.vendor_waybill_id LIKE ? OR t2.courier_name LIKE ? OR t2.courier_mobile LIKE ?
 			`
-		sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
+			sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
-		if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
+			if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
-			sqlWhere += " OR t1.store_id = ? OR t1.jx_store_id = ?"
+				sqlWhere += " OR t1.store_id = ? OR t1.jx_store_id = ?"
-			sqlParams = append(sqlParams, keywordInt64, keywordInt64)
+				sqlParams = append(sqlParams, keywordInt64, keywordInt64)
+			}
+			sqlWhere += ")"
 		}
-		sqlWhere += ")"
-	}
 
-	if params["vendorIDs"] != nil {
+		if params["vendorIDs"] != nil {
-		var vendorIDs []int
+			var vendorIDs []int
-		if err = utils.UnmarshalUseNumber([]byte(params["vendorIDs"].(string)), &vendorIDs); err != nil {
+			if err = utils.UnmarshalUseNumber([]byte(params["vendorIDs"].(string)), &vendorIDs); err != nil {
-			return nil, err
+				return nil, err
+			}
+			if len(vendorIDs) > 0 {
+				sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDs)) + ")"
+				sqlParams = append(sqlParams, vendorIDs)
+			}
 		}
-		if len(vendorIDs) > 0 {
+		if params["waybillVendorIDs"] != nil {
-			sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDs)) + ")"
+			var waybillVendorIDs []int
-			sqlParams = append(sqlParams, vendorIDs)
+			if err = utils.UnmarshalUseNumber([]byte(params["waybillVendorIDs"].(string)), &waybillVendorIDs); err != nil {
+				return nil, err
+			}
+			if len(waybillVendorIDs) > 0 {
+				sqlWhere += " AND t2.waybill_vendor_id IN (" + dao.GenQuestionMarks(len(waybillVendorIDs)) + ")"
+				sqlParams = append(sqlParams, waybillVendorIDs)
+			}
+		}
+		if params["storeIDs"] != nil {
+			var storeIDs []int
+			if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err != nil {
+				return nil, err
+			}
+			if len(storeIDs) > 0 {
+				sqlWhere += " AND IF(t1.vendor_id = ?, t1.store_id, IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) ) IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
+				sqlParams = append(sqlParams, model.VendorIDWSC, storeIDs)
+			}
+		}
+		if params["statuss"] != nil {
+			var statuss []int
+			if err = utils.UnmarshalUseNumber([]byte(params["statuss"].(string)), &statuss); err != nil {
+				return nil, err
+			}
+			if len(statuss) > 0 {
+				sqlWhere += " AND t1.status IN (" + dao.GenQuestionMarks(len(statuss)) + ")"
+				sqlParams = append(sqlParams, statuss)
+			}
+		}
+		if params["cities"] != nil {
+			var cities []int
+			if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {
+				return nil, err
+			}
+			if len(cities) > 0 {
+				sql += " JOIN store st ON t1.store_id = st.id"
+				sqlWhere += " AND st.city_code IN (" + dao.GenQuestionMarks(len(cities)) + ")"
+				sqlParams = append(sqlParams, cities)
+			}
 		}
 	}
-	if params["waybillVendorIDs"] != nil {
-		var waybillVendorIDs []int
-		if err = utils.UnmarshalUseNumber([]byte(params["waybillVendorIDs"].(string)), &waybillVendorIDs); err != nil {
-			return nil, err
-		}
-		if len(waybillVendorIDs) > 0 {
-			sqlWhere += " AND t2.waybill_vendor_id IN (" + dao.GenQuestionMarks(len(waybillVendorIDs)) + ")"
-			sqlParams = append(sqlParams, waybillVendorIDs)
-		}
-	}
-	if params["storeIDs"] != nil {
-		var storeIDs []int
-		if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err != nil {
-			return nil, err
-		}
-		if len(storeIDs) > 0 {
-			sqlWhere += " AND IF(t1.vendor_id = ?, t1.store_id, IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) ) IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
-			sqlParams = append(sqlParams, model.VendorIDWSC, storeIDs)
-		}
-	}
-	if params["statuss"] != nil {
-		var statuss []int
-		if err = utils.UnmarshalUseNumber([]byte(params["statuss"].(string)), &statuss); err != nil {
-			return nil, err
-		}
-		if len(statuss) > 0 {
-			sqlWhere += " AND t1.status IN (" + dao.GenQuestionMarks(len(statuss)) + ")"
-			sqlParams = append(sqlParams, statuss)
-		}
-	}
-	if params["cities"] != nil {
-		var cities []int
-		if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {
-			return nil, err
-		}
-		if len(cities) > 0 {
-			sql += " JOIN store st ON t1.store_id = st.id"
-			sqlWhere += " AND st.city_code IN (" + dao.GenQuestionMarks(len(cities)) + ")"
-			sqlParams = append(sqlParams, cities)
-		}
-	}
-
 	sql += sqlWhere
 	sql += `
 	ORDER BY t1.order_created_at DESC

controllers/jx_order.go

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