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

GetOrders添加参数adjustCount，表示最少调整次数

Browse Source
This commit is contained in:
gazebo
2019-10-14 17:27:45 +08:00
parent d9e0dfa279
commit a0a668e546
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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" 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) sqlParams = append(sqlParams, skuIDs)
} }
if params["adjustCount"] != nil {
sqlWhere += " AND t1.adjust_count >= ?"
sqlParams = append(sqlParams, params["adjustCount"])
}
} }
if params["vendorIDs"] != nil { if params["vendorIDs"] != nil {
var vendorIDs []int var vendorIDs []int

1
controllers/jx_order.go
View File

@@ -277,6 +277,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Param isIncludeFake query bool false "是否包括假订单" // @Param isIncludeFake query bool false "是否包括假订单"
// @Param skuIDs query string false "包含的skuID列表，或的关系" // @Param skuIDs query string false "包含的skuID列表，或的关系"
// @Param isJxFirst query bool false "排序是否京西订单优先（缺省为否）" // @Param isJxFirst query bool false "排序是否京西订单优先（缺省为否）"
// @Param adjustCount query int false "最小调整次数"
// @Param offset query int false "结果起始序号（以0开始，缺省为0）" // @Param offset query int false "结果起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）" // @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult