trace

app/common/model/Merchant.php

@@ -71,15 +71,11 @@ class Merchant extends BaseModel
      */
     public static function detail(int $merchantId)
     {
-        try {
+        $where = [
-            $list = self::withoutGlobalScope()
+            'merchant_id' => $merchantId,
-                ->with(['logoImage', "licenseImage"])
+            'store_id' => self::$storeId
-                ->where('merchant_id', '=', $merchantId)
+        ];
-                ->find();
+        return static::get($where, []);
-            return $list ?? null;
-        } catch (\Exception $e) {
-            return null;
-        }
     }
 
     /**