diff --git a/app/common/model/Merchant.php b/app/common/model/Merchant.php index d1e52e8c..2b73349d 100644 --- a/app/common/model/Merchant.php +++ b/app/common/model/Merchant.php @@ -71,15 +71,11 @@ class Merchant extends BaseModel */ public static function detail(int $merchantId) { - try { - $list = self::withoutGlobalScope() - ->with(['logoImage', "licenseImage"]) - ->where('merchant_id', '=', $merchantId) - ->find(); - return $list ?? null; - } catch (\Exception $e) { - return null; - } + $where = [ + 'merchant_id' => $merchantId, + 'store_id' => self::$storeId + ]; + return static::get($where, []); } /**