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

dao.GetStoreDetail针对VendorIDJX特殊处理

Browse Source
This commit is contained in:
gazebo
2019-09-29 17:51:57 +08:00
parent 4c6cdc4e97
commit 7d03337e50
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/act/act.go
View File

@@ -162,6 +162,8 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName()) dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap) actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
} }
} else {
globals.SugarLogger.Debugf("ActStoreSkuParam2Model storeID:%d, skuID:%d没有关注", v.StoreID, v.SkuID)
} }
} }
wholeValidVendorMap[vendorID] = 1 wholeValidVendorMap[vendorID] = 1

5
business/model/dao/store.go
View File

@@ -59,7 +59,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
district.name district_name, district.name district_name,
city.name city_name city.name city_name
FROM store t1 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 city ON city.code = t1.city_code
LEFT JOIN place district ON district.code = t1.district_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 = ? 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,
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }
if vendorID != model.VendorIDJX {
sql += " AND t2.id IS NOT NULL"
}
if storeID > 0 { if storeID > 0 {
sql += " AND t1.id = ?" sql += " AND t1.id = ?"
sqlParams = append(sqlParams, storeID) sqlParams = append(sqlParams, storeID)