GetOrders添加可选参数isJxFirst

controllers/jx_order.go

@@ -276,6 +276,7 @@ func (c *OrderController) ExportMTWaybills() {
 // @Param	cities			query	string	false	"城市code列表[1,2,3]，缺省不限制"
 // @Param	isIncludeFake	query	bool	false	"是否包括假订单"
 // @Param	skuIDs			query	string	false	"包含的skuID列表，或的关系"
+// @Param	isJxFirst		query	bool	false	"排序是否京西订单优先（缺省为否）"
 // @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult
@@ -285,7 +286,7 @@ func (c *OrderController) GetOrders() {
 	c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
 		var skuIDs []int
 		if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDs); err == nil {
-			retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.MapData, params.Offset, params.PageSize)
+			retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.IsJxFirst, params.MapData, params.Offset, params.PageSize)
 		}
 		return retVal, "", err
 	})