This commit is contained in:
苏尹岚
2021-03-25 17:47:14 +08:00
parent dd038c8de2
commit 42f4c89771

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
FROM sku_name a
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,
utils.DefaultTimeValue,
utils.DefaultTimeValue, storeID,
utils.DefaultTimeValue,
)
if !isFocus {
sql += `
@@ -342,8 +342,9 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
sql += `
WHERE a.deleted_at = ?
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 {
sql += " AND ((a.status = ? AND b.status = ?) OR c.status = ?)"
sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal, model.SkuStatusNormal)