From aec362a466cd4c188ff4d51ed8ed84d3cfb17cf7 Mon Sep 17 00:00:00 2001
From: lqmac <lqmac@qq.com>
Date: Mon, 3 Jun 2024 22:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/service/cashier/Payment.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/api/service/cashier/Payment.php b/app/api/service/cashier/Payment.php
index 2da51432..61edc504 100644
--- a/app/api/service/cashier/Payment.php
+++ b/app/api/service/cashier/Payment.php
@@ -99,8 +99,11 @@ class Payment extends BaseService
         // 获取结算订单信息
         $OrderModel = new OrderModel;
         $orderInfo = $OrderModel->getUnpaidOrderDetail($this->orderId);
+        //当前商户是系统自动创建的商户，自动读取商城主的支付配置
+        $model = \app\store\model\Merchant::detail($orderInfo['merchant_id']);
+        $merchantId = ($model && $model->channel_id > 0) ? 0 : $orderInfo['merchant_id'];
 
-        $methods = $PaymentModel->getMethodsByClient($this->client, true, $orderInfo['store_id'], $orderInfo['merchant_id']);
+        $methods = $PaymentModel->getMethodsByClient($this->client, true, $orderInfo['store_id'], $merchantId);
         return [
             'order' => $orderInfo,
             'personal' => $userInfo,
@@ -267,6 +270,9 @@ class Payment extends BaseService
     private function getPaymentConfig(int $merchantId = null)
     {
         $PaymentModel = new PaymentModel;
+        //当前商户是系统自动创建的商户，自动读取商城主的支付配置
+        $model = \app\store\model\Merchant::detail($merchantId);
+        $merchantId = ($model && $model->channel_id > 0) ? 0 : $merchantId;
         $templateInfo = $PaymentModel->getPaymentInfo($this->method, $this->client, $this->getStoreId(), $merchantId);
         return $templateInfo['template']['config'][$this->method];
     }