Merge branch 'redesign‌-260706'

biz-hd/homePageConfig/classes/HomePageDisplayClass.php

@@ -30,7 +30,8 @@ class HomePageDisplayClass
         $rise = GoodsSettingClass::getRise($mainId);
         return [
             'modules' => HomePageConfigClass::getModules($mainId, $shopId),
-            'topNav' => self::formatTopNav($mainId, HomePageConfigClass::getTopNav($mainId, $shopId)),
+            // 顶栏店名必须用 shopId 查 xhShop，勿传 mainId（二者常不一致会导致无店名）
+            'topNav' => self::formatTopNav($shopId, HomePageConfigClass::getTopNav($mainId, $shopId)),
             'banner' => self::formatBanner(HomePageConfigClass::getBanner($mainId, $shopId)),
             'navGrid' => self::formatNavGrid(HomePageModuleClass::getNavGrid($mainId, $shopId)),
             'seckill' => self::formatActivity(HomePageModuleClass::getSeckill($mainId, $shopId, true)),
@@ -44,13 +45,13 @@ class HomePageDisplayClass
     /**
      * 格式化顶部导航：门店名称不落 Redis，实时取 xhShop.merchantName
      *
-     * @param int $mainId 门店 shopId
+     * @param int $shopId 门店 id（xhShop.id，即 mall account）
      * @param array $data HomePageConfigClass::getTopNav 返回值
      * @return array
      */
-    public static function formatTopNav($mainId, $data)
+    public static function formatTopNav($shopId, $data)
     {
-        $shop = ShopClass::getById($mainId, false, 'merchantName');
+        $shop = ShopClass::getById((int)$shopId, false, 'merchantName');
         $data['merchantName'] = is_array($shop) ? ($shop['merchantName'] ?? '') : '';
         return $data;
     }