From 846433ad0e1c22f912e10e66455746f4c8314d90 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 7 Sep 2021 18:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/MiniProgramService.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crmeb/crmeb/services/MiniProgramService.php b/crmeb/crmeb/services/MiniProgramService.php
index 5f003e3db..c4258841c 100644
--- a/crmeb/crmeb/services/MiniProgramService.php
+++ b/crmeb/crmeb/services/MiniProgramService.php
@@ -89,7 +89,7 @@ class MiniProgramService
     public static function options()
     {
         $wechat = SystemConfigService::more(['site_url', 'routine_appId', 'routine_appsecret']);
-        $payment = SystemConfigService::more(['pay_routine_mchid', 'pay_routine_key', 'pay_routine_client_cert', 'pay_routine_client_key', 'pay_weixin_open']);
+        $payment = SystemConfigService::more(['pay_weixin_mchid', 'pay_weixin_key', 'pay_weixin_client_cert', 'pay_weixin_client_key', 'pay_weixin_open']);
         $config = [];
         $config['mini_program'] = [
             'app_id' => isset($wechat['routine_appId']) ? trim($wechat['routine_appId']) : '',
@@ -99,10 +99,10 @@ class MiniProgramService
         ];
         $config['payment'] = [
             'app_id' => isset($wechat['routine_appId']) ? trim($wechat['routine_appId']) : '',
-            'merchant_id' => trim($payment['pay_routine_mchid']),
-            'key' => trim($payment['pay_routine_key']),
-            'cert_path' => realpath('.' . $payment['pay_routine_client_cert']),
-            'key_path' => realpath('.' . $payment['pay_routine_client_key']),
+            'merchant_id' => trim($payment['pay_weixin_mchid']),
+            'key' => trim($payment['pay_weixin_key']),
+            'cert_path' => realpath('.' . $payment['pay_weixin_client_cert']),
+            'key_path' => realpath('.' . $payment['pay_weixin_client_key']),
             'notify_url' => trim($wechat['site_url']) . Url::buildUrl('/api/routine/notify')
         ];
         return $config;