From 573b6c703e76193321454ce323d0e5f1de8a9c2f Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 11 May 2023 09:47:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../easywechat/orderShipping/MiniOrderService.php         | 7 +++++--
 .../services/easywechat/orderShipping/ServiceProvider.php | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php b/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php
index b588ef45e..6851c16c8 100644
--- a/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php
+++ b/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php
@@ -3,6 +3,7 @@
 namespace crmeb\services\easywechat\orderShipping;
 
 use crmeb\services\easywechat\Application;
+use crmeb\services\SystemConfigService;
 
 class MiniOrderService
 {
@@ -21,10 +22,12 @@ class MiniOrderService
      */
     protected static function options(array $config = [])
     {
+        $payment = SystemConfigService::more(['routine_appId', 'routine_appsecret', 'pay_weixin_mchid', 'pay_new_weixin_open', 'pay_new_weixin_mchid']);
         return [
             'order_shipping' => [
-                'appid' => sys_config('routine_appId'),
-                'merchant_id' => sys_config('pay_new_weixin_open') ? sys_config('pay_weixin_mchid') : sys_config('pay_new_weixin_mchid'),
+                'appid' => $payment['routine_appId'] ?? '',
+                'secret' => $payment['routine_appsecret'] ?? '',
+                'merchant_id' => empty($payment['pay_new_weixin_open']) ? trim($payment['pay_weixin_mchid']) : trim($payment['pay_new_weixin_mchid']),
             ]
         ];
     }
diff --git a/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php b/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php
index 17d11dffe..989b02c02 100644
--- a/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php
+++ b/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php
@@ -29,6 +29,14 @@ class ServiceProvider implements ServiceProviderInterface
      */
     public function register(Container $pimple)
     {
+        $pimple['mini_program.access_token'] = function ($pimple) {
+            return new AccessToken(
+                $pimple['config']['order_shipping']['app_id'],
+                $pimple['config']['order_shipping']['secret'],
+                $pimple['cache']
+            );
+        };
+
         $pimple['order_ship'] = function ($pimple) {
             return new OrderClient($pimple['access_token'], $pimple);
         };