diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 81f9541b7..41a71bffe 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -757,14 +757,18 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []strin sqlParams = append(sqlParams, params["minimumPrice"]) } } - if _, ok := params["minStock"]; ok { + if params["minStock"] != 0 && params["minStock"] != nil { sql += " AND t4.stock >= ? " sqlParams = append(sqlParams, params["minStock"]) } - if _, ok := params["maxStock"]; ok { + if params["maxStock"] != 0 && params["maxStock"] != nil { sql += " AND t4.stock <= ? " sqlParams = append(sqlParams, params["minStock"]) } + if params["locationCode"] != "" && params["locationCode"] != nil { + sql += " AND t4.location_code LIKE ? " + sqlParams = append(sqlParams, "%"+params["minStock"].(string)+"%") + } return sql, sqlParams, err } diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 6c9e0d177..0cd697738 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -98,7 +98,8 @@ func (c *StoreSkuController) GetStoreSkus() { // @Param highestPrice query string false "查询最高价" // @Param minimumPrice query string false "查询最低价" // @Param minStock query int false "最小库存" -// @Param maxStock query int false "最大库存" +// @Param maxStock query int false "最大库存" +// @Param locationCode query string false "货架码" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /GetStoresSkus [get,post]