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:38:41 +08:00
parent 964f13e2f1
commit e61db3ce10
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,14 +341,15 @@ 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) AND (a.is_global = 1 OR f.id IS NOT NULL OR 1 = ?)
AND ((a.status = 1 AND b.status = 1) OR c.status = 1)
` `
sqlParams = append(sqlParams, sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.Bool2Int(isFocus))
utils.DefaultTimeValue, if isFocus {
) sql += " AND ((a.status = ? AND b.status = ?) OR c.status = ?)"
if !isFocus { sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal, model.SkuStatusNormal)
sql += " AND c.sku_id IS NULL" } else {
sql += " AND c.sku_id IS NULL AND (a.status = ? AND b.status = ?)"
sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal)
} }
if keyword != "" { if keyword != "" {
sql += " AND a.name LIKE ?" sql += " AND a.name LIKE ?"
@@ -375,9 +376,13 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
SELECT a.*, b.status store_sku_status SELECT a.*, b.status store_sku_status
FROM sku a FROM sku a
JOIN store_sku_bind b ON a.id = b.sku_id AND b.deleted_at = ? AND b.store_id = ? JOIN store_sku_bind b ON a.id = b.sku_id AND b.deleted_at = ? AND b.store_id = ?
WHERE a.deleted_at = ? AND a.name_id = ? JOIN sku_name c ON a.name_id = c.id AND c.deleted_at = ? AND c.status = ?
WHERE a.deleted_at = ? AND a.name_id = ? AND a.status = ?
` `
sqlParams2 := []interface{}{utils.DefaultTimeValue, storeID, utils.DefaultTimeValue, v.ID} sqlParams2 := []interface{}{utils.DefaultTimeValue, storeID,
utils.DefaultTimeValue, model.SkuStatusNormal,
utils.DefaultTimeValue, v.ID, model.SkuStatusNormal,
}
if status != -1 { if status != -1 {
sql2 += " AND b.status = ?" sql2 += " AND b.status = ?"
sqlParams2 = append(sqlParams2, status) sqlParams2 = append(sqlParams2, status)