From a0a668e54634398ae40dd7462c077891a2c493a3 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 14 Oct 2019 17:27:45 +0800 Subject: [PATCH] =?UTF-8?q?GetOrders=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0ad?= =?UTF-8?q?justCount=EF=BC=8C=E8=A1=A8=E7=A4=BA=E6=9C=80=E5=B0=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 4 ++++ controllers/jx_order.go | 1 + 2 files changed, 5 insertions(+) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 7f2631e17..31bceb2a7 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -376,6 +376,10 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku, isInclude sqlWhere += " AND (SELECT COUNT(*) FROM order_sku t11 WHERE t11.vendor_order_id = t1.vendor_order_id AND t11.vendor_id = t1.vendor_id AND t11.jx_sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")) > 0" sqlParams = append(sqlParams, skuIDs) } + if params["adjustCount"] != nil { + sqlWhere += " AND t1.adjust_count >= ?" + sqlParams = append(sqlParams, params["adjustCount"]) + } } if params["vendorIDs"] != nil { var vendorIDs []int diff --git a/controllers/jx_order.go b/controllers/jx_order.go index b2612224b..31a170894 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -277,6 +277,7 @@ func (c *OrderController) ExportMTWaybills() { // @Param isIncludeFake query bool false "是否包括假订单" // @Param skuIDs query string false "包含的skuID列表，或的关系" // @Param isJxFirst query bool false "排序是否京西订单优先（缺省为否）" +// @Param adjustCount query int false "最小调整次数" // @Param offset query int false "结果起始序号（以0开始，缺省为0）" // @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）" // @Success 200 {object} controllers.CallResult