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

Merge remote-tracking branch 'origin/qidongsheng' into jdshop

Browse Source
This commit is contained in:
苏尹岚
2020-07-09 09:45:47 +08:00
parent e62811eef1 624f55e3fd
commit 8e6f62dfdf
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/sku.go
View File

@@ -600,7 +600,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
t1.ex_prefix_end,
t1.yb_name_suffix,
t1.jds_stock_switch,
t1.preparation_time
t1.preparation_time,
t1.best_seller
`
if isQueryMidPrice {
sql += `,
@@ -645,6 +646,7 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
t1.yb_name_suffix,
t1.jds_stock_switch,
t1.preparation_time,
t1.best_seller,
`
if isQueryMidPrice {
sqlData += " t4.mid_unit_price,"

28
business/jxstore/cms/store_sku.go
View File

@@ -454,6 +454,13 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
}
sql += ")"
}
/*前台传入的最大值和最小值设置*/
if params["highestPrice"] != "" && params["highestPrice"] != nil {
sql += " AND t4.unit_price <= " + params["highestPrice"].(string)
}
if params["minimumPrice"] != "" && params["minimumPrice"] != nil {
sql += " AND t4.unit_price >= " + params["minimumPrice"].(string)
}
}
return sql, sqlParams, err
}
@@ -473,6 +480,27 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
if params["actVendorID"] != nil {
actVendorID = int(utils.Interface2Int64WithDefault(params["actVendorID"], -1))
}
var highestPrice, minimumPrice float64
if params["highestPrice"] != nil {
if _, ok := params["highestPrice"].(float64); !ok {
delete(params, "highestPrice")
} else {
highestPrice = params["highestPrice"].(float64)
}
}
if params["minimumPrice"] != nil {
if _, ok := params["minimumPrice"].(float64); !ok {
delete(params, "minimumPrice")
} else {
minimumPrice = params["minimumPrice"].(float64)
}
}
if !(highestPrice > 0 && highestPrice > minimumPrice) || !(highestPrice > 0) {
delete(params, "highestPrice")
}
if !(minimumPrice >= 0 && highestPrice > 0 && highestPrice > minimumPrice) || !(minimumPrice >= 0) {
delete(params, "minimumPrice")
}
db := dao.GetDB()
sql, sqlParams, err := getGetStoresSkusBaseSQL(db, storeIDs, skuIDs, isFocus, keyword, isBySku, isAct, isHighPrice, priceType, actVendorID, params)
if err != nil {

2
controllers/cms_store_sku.go
View File

@@ -91,6 +91,8 @@ func (c *StoreSkuController) GetStoreSkus() {
// @Param lockTime query string false "价格锁定时间"
// @Param isHighPrice query bool false "是否查过高价格商品,0是忽略，1是高价，-1是低价"
// @Param priceType query int false "是否查过高价格商品,0是忽略，1是高价，-1是低价"
// @Param highestPrice query string false "查询最高价"
// @Param minimumPrice query string false "查询最低价"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetStoresSkus [get,post]