From 7d03337e5036c1e9330572a9d47353028f7aa044 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 29 Sep 2019 17:51:57 +0800 Subject: [PATCH] =?UTF-8?q?dao.GetStoreDetail=E9=92=88=E5=AF=B9VendorIDJX?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 2 ++ business/model/dao/store.go | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index aade8e146..c0aa517e0 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -162,6 +162,8 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName()) actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap) } + } else { + globals.SugarLogger.Debugf("ActStoreSkuParam2Model storeID:%d, skuID:%d没有关注", v.StoreID, v.SkuID) } } wholeValidVendorMap[vendorID] = 1 diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 13e0e565d..aae783c26 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -59,7 +59,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto district.name district_name, city.name city_name FROM store t1 - JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ? + LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ? LEFT JOIN place city ON city.code = t1.city_code LEFT JOIN place district ON district.code = t1.district_code LEFT JOIN new_config t3 ON t3.key = t2.price_percentage_pack AND t3.type = ? AND t3.deleted_at = ? @@ -72,6 +72,9 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto utils.DefaultTimeValue, utils.DefaultTimeValue, } + if vendorID != model.VendorIDJX { + sql += " AND t2.id IS NOT NULL" + } if storeID > 0 { sql += " AND t1.id = ?" sqlParams = append(sqlParams, storeID)