From 6f403e909f6869172d9df859fa5a76ac5641dc7a Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 9 Aug 2019 11:59:38 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8DGetStores=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=99=90=E5=88=B6new=5Fconfig=E6=9C=AA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 3 ++- business/model/dao/act.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b838cecb9..73cf82625 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -180,7 +180,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa CONCAT('[', GROUP_CONCAT(DISTINCT CONCAT('{"vendorStoreID":"', m2.vendor_store_id, '", "vendorID":', m2.vendor_id, ', "status":', m2.status, '}')), ']') courier_map_str FROM store t1 - LEFT JOIN new_config bank ON bank.type = ? AND bank.key = t1.payee_bank_code + LEFT JOIN new_config bank ON bank.deleted_at = ? AND bank.type = ? AND bank.key = t1.payee_bank_code 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 m1 ON t1.id = m1.store_id AND m1.deleted_at = ? @@ -189,6 +189,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa LEFT JOIN store_courier_map m2 ON t1.id = m2.store_id AND m2.deleted_at = ? ` sqlParams := []interface{}{ + utils.DefaultTimeValue, model.ConfigTypeBank, utils.DefaultTimeValue, utils.DefaultTimeValue, diff --git a/business/model/dao/act.go b/business/model/dao/act.go index 5c664d859..d20aafd6a 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -122,7 +122,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs ) if keyword != "" { keywordLike := "%" + keyword + "%" - sql += " AND (t7.namke LIKE ? OR t6.name LIKE ?" + sql += " AND (t7.name LIKE ? OR t6.name LIKE ?" sqlParams = append(sqlParams, keywordLike, keywordLike) if intKeyword := int(utils.Str2Int64WithDefault(keyword, 0)); intKeyword > 0 { sql += " OR t1.sku_id = ? OR t1.store_id = ?"