diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index bb292825b..61b36f8b9 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1952,7 +1952,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs globals.SugarLogger.Debugf("---------skuBindInfos := %s", utils.Format4Output(skuBindInfos, false)) } for _, skuBindInfo := range skuBindInfos { - if skuBindInfo.StoreID == 668470 { + if storeID == 668470 { globals.SugarLogger.Debugf("---------skuBindInfo := %s", utils.Format4Output(skuBindInfo, false)) } // 关注且没有给价时,需要尝试从store_sku_bind中得到已有的单价 @@ -2036,7 +2036,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs } } unitPrice = int(math.Floor(float64(unitPrice)*scaleFactor/10+0.5)) * 10 //四舍五入 价格为100倍 角分为十位个位 除以10 + 0.5对分位向下取整(完成四舍五入的方法) - if skuBindInfo.StoreID == 668470 { + if storeID == 668470 { globals.SugarLogger.Debugf("-----------allBinds := %s", utils.Format4Output(allBinds, false)) } for _, v := range allBinds { diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go index a2bd123d8..f9959b37a 100644 --- a/business/jxstore/common/common.go +++ b/business/jxstore/common/common.go @@ -109,7 +109,7 @@ func GetNearSupplyGoodsStoreByStoreID(ctx *jxcontext.Context, storeID int) (stor return store, err } -func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius int, needWalkDistance, isJds bool, brandID int) (storeList []*Store4User, err error) { +func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius int, needWalkDistance, isJds bool, brandID []int) (storeList []*Store4User, err error) { const ( maxStoreCount4User = 5 ) @@ -140,8 +140,8 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius model.YES, model.MatterStoreID, ) - if brandID != 0 { - sql += " AND t1.brand_id = ?" + if len(brandID) != 0 { + sql += " AND t1.brand_id IN (" + dao.GenQuestionMarks(len(brandID)) + ")" sqlParams = append(sqlParams, brandID) } sql += ` diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 02a64e4aa..c20f4f29f 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -644,7 +644,7 @@ func (c *StoreController) GetStoreListByLocation() { // @Param lng query float64 true "经度" // @Param lat query float64 true "纬度" // @Param needWalkDistance query bool false "是否需要返回步行距离(且以步行距离排序)" -// @Param brandID query int true "品牌ID" +// @Param brandID query int false "品牌ID" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /GetHomePageByLocation [get]