1

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);