trace

7 months ago · c9d99f7975
parent 6c7b1ae4c0
commit c9d99f7975
1 changed files with 5 additions and 9 deletions
--- 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, []);
    }

    /**