1

business/jxstore/cms/store.go

@@ -6018,7 +6018,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
 	if err != nil {
 		return nil, "经纬度获取推荐门店失败", err
 	}
-	//if token != "" {
 	//权限过滤门店
 	//filterStore, _, err := FilterByB2B(locationList, token)
 	filterStore, _, err := FilterByB2B(locationList)
@@ -6027,6 +6026,27 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
 	}
 	for _, v := range filterStore {
 		storeID = append(storeID, v.ID)
+	}
+	//获取热销商品
+	topSkusInfo, err := GetTopSkusByStoreIDs(ctx, storeID)
+	if err != nil {
+		return nil, "获取热销商品失败", err
+	}
+	for _, j := range topSkusInfo {
+		storeSkuInfo = StoreSkuInfo{
+			StoreID:    j.StoreID,
+			SkuID:      j.SkuID,
+			SkuName:    j.Name,
+			SkuStatus:  j.Status,
+			BestSeller: j.BestSeller,
+			Img:        j.Img,
+			Price:      j.Price,
+			Unit:       j.Unit,
+		}
+		StoreSkuInfos = append(StoreSkuInfos, storeSkuInfo)
+	}
+
+	for _, v := range filterStore {
 		//获取门店品牌信息
 		brandInfos, err := dao.GetStoreBrandInfos(v.ID)
 		if err != nil {
@@ -6068,47 +6088,32 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
 			storeDeductionInfos = append(storeDeductionInfos, storeDeductionInfo)
 		}
 		//}
-		//获取热销商品
-		topSkusInfo, err := GetTopSkusByStoreIDs(ctx, storeID)
-		if err != nil {
-			return nil, "获取热销商品失败", err
-		}
-		for _, j := range topSkusInfo {
-			storeSkuInfo = StoreSkuInfo{
-				StoreID:    j.StoreID,
-				SkuID:      j.SkuID,
-				SkuName:    j.Name,
-				SkuStatus:  j.Status,
-				BestSeller: j.BestSeller,
-				Img:        j.Img,
-				Price:      j.Price,
-				Unit:       j.Unit,
-			}
-			StoreSkuInfos = append(StoreSkuInfos, storeSkuInfo)
-		}
-		for _, i := range storeInfos {
-			homePage := HomePageInfos{}
-			i := i
-			homePage.StoreInfo = i
-			for _, j := range storeDeductionInfos {
-				j := j
-				if i.StoreID == j.StoreID {
-					homePage.StoreDeductionInfo = append(homePage.StoreDeductionInfo, j)
-				} else {
-					continue
-				}
-			}
-			for _, k := range StoreSkuInfos {
-				k := k
-				if i.StoreID == k.StoreID {
-					homePage.StoreSkuInfo = append(homePage.StoreSkuInfo, k)
-				} else {
-					continue
-				}
-			}
-			homePages = append(homePages, homePage)
-		}
+
 	}
+
+	for _, i := range storeInfos {
+		homePage := HomePageInfos{}
+		i := i
+		homePage.StoreInfo = i
+		for _, j := range storeDeductionInfos {
+			j := j
+			if i.StoreID == j.StoreID {
+				homePage.StoreDeductionInfo = append(homePage.StoreDeductionInfo, j)
+			} else {
+				continue
+			}
+		}
+		for _, k := range StoreSkuInfos {
+			k := k
+			if i.StoreID == k.StoreID {
+				homePage.StoreSkuInfo = append(homePage.StoreSkuInfo, k)
+			} else {
+				continue
+			}
+		}
+		homePages = append(homePages, homePage)
+	}
+
 	return homePages, "", nil
 }