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

- remove literal '1970-01-01 00:00:00'

Browse Source
This commit is contained in:
gazebo
2018-10-21 11:12:41 +08:00
parent 105a1271b7
commit 1a9ff7e575
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,11 +64,11 @@ func GetStoreSkus(storeID int, isFocus bool, keyword string, params map[string]i
db := dao.GetDB()
sql := `
FROM sku_name t1
JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00' AND t2.status = ?
LEFT JOIN store_sku_bind t4 ON t4.sku_id = t2.id AND t4.deleted_at = '1970-01-01 00:00:00' AND t4.store_id = ?
JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? AND t2.status = ?
LEFT JOIN store_sku_bind t4 ON t4.sku_id = t2.id AND t4.deleted_at = ? AND t4.store_id = ?
JOIN store t3 ON t3.id = ?
LEFT JOIN sku_name_place_bind t5 ON t1.id = t5.name_id AND t3.city_code = t5.place_code
WHERE t1.deleted_at = '1970-01-01 00:00:00' AND (t1.is_global = 1 OR t5.id IS NOT NULL OR t4.status = ?)
WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR t4.status = ?)
`
if isFocus {
sql += " AND t4.sku_id IS NOT NULL"
@@ -76,9 +76,12 @@ func GetStoreSkus(storeID int, isFocus bool, keyword string, params map[string]i
sql += " AND t4.sku_id IS NULL"
}
sqlParams := []interface{}{
utils.DefaultTimeValue,
model.SkuStatusNormal,
utils.DefaultTimeValue,
storeID,
storeID,
utils.DefaultTimeValue,
model.SkuStatusNormal,
}
if keyword != "" {