From bb7cc58a7ba1bd5815aea56307455d35a60136b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=98=89?= <445241500@qq.com>
Date: Tue, 28 May 2024 23:22:52 +0800
Subject: [PATCH] 1

---
 app/common/model/Payment.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/common/model/Payment.php b/app/common/model/Payment.php
index 63e54289..0cc6d797 100644
--- a/app/common/model/Payment.php
+++ b/app/common/model/Payment.php
@@ -85,6 +85,9 @@ class Payment extends BaseModel
         $model = new static;
         // 默认的支付方式数据
         $defaultData = $model->defaultData();
+        if (empty($merchantId)) {
+            $merchantId = 0;
+        }
         if (!$data = Cache::get("11payment_{$storeId}_{$merchantId}")) {
             // 获取所有支付方式
             $data = $model->dataByStorage($storeId, $defaultData, $merchantId);