From 1a9ff7e575fca504eb352b8efc3a29b340233e25 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 21 Oct 2018 11:12:41 +0800 Subject: [PATCH] - remove literal '1970-01-01 00:00:00' --- business/jxstore/cms/sku.go | 23 ++++++++++++++--------- business/jxstore/cms/store.go | 26 ++++++++++++++++---------- business/jxstore/cms/store_sku.go | 9 ++++++--- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 1fd07c50e..c69534025 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -33,8 +33,10 @@ func GetVendorCategories(vendorID int, parentID string) (vendorCats []*model.Sku // parentID 为-1表示所有 func GetCategories(parentID int) (cats []*model.SkuCategory, err error) { - params := []interface{}{} - sql := "SELECT * FROM sku_category WHERE deleted_at = '1970-01-01 00:00:00' " + params := []interface{}{ + utils.DefaultTimeValue, + } + sql := "SELECT * FROM sku_category WHERE deleted_at = ?" if parentID != -1 { sql += " AND parent_id = ?" params = append(params, parentID) @@ -120,16 +122,16 @@ func DeleteCategory(categoryID int, userName string) (num int64, err error) { if err = dao.GetRows(db, &countInfos, ` SELECT COUNT(*) ct FROM sku t1 - WHERE t1.category_id = ? + WHERE t1.category_id = ? AND t1.deleted_at = ? UNION ALL SELECT COUNT(*) ct FROM sku_name t1 - WHERE t1.category_id = ? + WHERE t1.category_id = ? AND t1.deleted_at = ? UNION ALL SELECT COUNT(*) ct FROM sku_category t1 - WHERE t1.parent_id = ? - `, categoryID, categoryID, categoryID, &countInfos); err == nil { + WHERE t1.parent_id = ? AND t1.deleted_at = ? + `, categoryID, utils.DefaultTimeValue, categoryID, utils.DefaultTimeValue, categoryID, utils.DefaultTimeValue, &countInfos); err == nil { if countInfos[0].Ct != 0 { return 0, errors.New("还有商品使用此类别，不能删除") } else if countInfos[1].Ct != 0 { @@ -148,10 +150,13 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize db := dao.GetDB() sql := ` FROM sku_name t1 - LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00' + LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id - WHERE t1.deleted_at = '1970-01-01 00:00:00'` - sqlParams := make([]interface{}, 0) + WHERE t1.deleted_at = ?` + sqlParams := []interface{}{ + utils.DefaultTimeValue, + utils.DefaultTimeValue, + } if keyword != "" { keywordLike := "%" + keyword + "%" sql += " AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ?" diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 7ab817bda..9f5828ccf 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -42,18 +42,21 @@ var ( // todo 门店绑定信息可以考虑以数组形式返回，而不是现在这样 func GetStores(keyword string, params map[string]interface{}, offset, pageSize int) (retVal *StoresInfo, err error) { - sqlFrom := ` + sqlWhere := ` FROM store t1 LEFT JOIN place city ON t1.city_code = city.code AND city.level = 2 LEFT JOIN place district ON t1.district_code = district.code AND district.level = 3 - LEFT JOIN store_map jdm ON t1.id = jdm.store_id AND jdm.vendor_id = 0 AND jdm.deleted_at = '1970-01-01 00:00:00' - LEFT JOIN store_map elmm ON t1.id = elmm.store_id AND elmm.vendor_id = 2 AND elmm.deleted_at = '1970-01-01 00:00:00' - LEFT JOIN store_map ebaim ON t1.id = ebaim.store_id AND ebaim.vendor_id = 3 AND ebaim.deleted_at = '1970-01-01 00:00:00' + LEFT JOIN store_map jdm ON t1.id = jdm.store_id AND jdm.vendor_id = 0 AND jdm.deleted_at = ? + LEFT JOIN store_map elmm ON t1.id = elmm.store_id AND elmm.vendor_id = 2 AND elmm.deleted_at = ? + LEFT JOIN store_map ebaim ON t1.id = ebaim.store_id AND ebaim.vendor_id = 3 AND ebaim.deleted_at = ? + WHERE t1.deleted_at = ? ` - sqlWhere := ` - WHERE t1.deleted_at = '1970-01-01 00:00:00' - ` - sqlParams := make([]interface{}, 0) + sqlParams := []interface{}{ + utils.DefaultTimeValue, + utils.DefaultTimeValue, + utils.DefaultTimeValue, + utils.DefaultTimeValue, + } if keyword != "" { keywordLike := "%" + keyword + "%" sqlWhere += " AND (t1.name LIKE ? OR t1.address LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ? OR city.name LIKE ?" @@ -131,8 +134,11 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i sqlWhere += sqlVendorStoreCond + ")" } } - sql := "SELECT SQL_CALC_FOUND_ROWS CAST(t1.lng AS DECIMAL(15,6))/1000000 float_lng,CAST(t1.lat AS DECIMAL(15,6))/1000000 float_lat, t1.*, city.name city_name, district.name district_name, jdm.vendor_store_id jd_id, elmm.vendor_store_id elm_id, ebaim.vendor_store_id ebai_id\n" + - sqlFrom + sqlWhere + ` + sql := ` + SELECT SQL_CALC_FOUND_ROWS CAST(t1.lng AS DECIMAL(15,6))/1000000 float_lng,CAST(t1.lat AS DECIMAL(15,6))/1000000 float_lat, + t1.*, city.name city_name, district.name district_name, + jdm.vendor_store_id jd_id, elmm.vendor_store_id elm_id, ebaim.vendor_store_id ebai_id + ` + sqlWhere + ` ORDER BY t1.id LIMIT ? OFFSET ?` pageSize = jxutils.FormalizePageSize(pageSize) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 12570f067..5bf2254c8 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -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 != "" {