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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-25 17:47:14 +08:00
parent dd038c8de2
commit 42f4c89771
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,11 +282,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, e.id store_id SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, e.id store_id
FROM sku_name a FROM sku_name a
JOIN sku b ON b.name_id = a.id AND b.deleted_at = ? JOIN sku b ON b.name_id = a.id AND b.deleted_at = ?
JOIN store e ON e.deleted_at = ? AND e.id = ? JOIN store e ON e.deleted_at = ?
` `
sqlParams = append(sqlParams, sqlParams = append(sqlParams,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, storeID, utils.DefaultTimeValue,
) )
if !isFocus { if !isFocus {
sql += ` sql += `
@@ -342,8 +342,9 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
sql += ` sql += `
WHERE a.deleted_at = ? WHERE a.deleted_at = ?
AND (a.is_global = 1 OR f.id IS NOT NULL OR 1 = ?) AND (a.is_global = 1 OR f.id IS NOT NULL OR 1 = ?)
AND e.id = ?
` `
sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.Bool2Int(isFocus)) sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.Bool2Int(isFocus), storeID)
if isFocus { if isFocus {
sql += " AND ((a.status = ? AND b.status = ?) OR c.status = ?)" sql += " AND ((a.status = ? AND b.status = ?) OR c.status = ?)"
sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal, model.SkuStatusNormal) sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal, model.SkuStatusNormal)