merchant

biz/message/classes/InformAdminClass.php

@@ -196,8 +196,9 @@ class InformAdminClass extends BaseClass
         $merchantId = $order['merchantId'];
         $orderId = $order['id'];
         $shopId = $order['shopId'];
+        $merchant = MerchantClass::getMerchantById($merchantId);
         if (empty($shopId)) {
-            $shopId = MerchantClass::getDefaultShopId($merchantId);
+            $shopId = MerchantClass::getDefaultShopId($merchant);
         }
         $adminList = ShopAdminService::getNoticeAdminList($shopId);
         $tm = xhTMessageService::getList(0);