Bläddra i källkod

fix: 修改微信订单传参

Gosowong 2 år sedan
förälder
incheckning
573b6c703e

+ 5 - 2
crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php

@@ -3,6 +3,7 @@
 namespace crmeb\services\easywechat\orderShipping;
 namespace crmeb\services\easywechat\orderShipping;
 
 
 use crmeb\services\easywechat\Application;
 use crmeb\services\easywechat\Application;
+use crmeb\services\SystemConfigService;
 
 
 class MiniOrderService
 class MiniOrderService
 {
 {
@@ -21,10 +22,12 @@ class MiniOrderService
      */
      */
     protected static function options(array $config = [])
     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 [
         return [
             'order_shipping' => [
             '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']),
             ]
             ]
         ];
         ];
     }
     }

+ 8 - 0
crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php

@@ -29,6 +29,14 @@ class ServiceProvider implements ServiceProviderInterface
      */
      */
     public function register(Container $pimple)
     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) {
         $pimple['order_ship'] = function ($pimple) {
             return new OrderClient($pimple['access_token'], $pimple);
             return new OrderClient($pimple['access_token'], $pimple);
         };
         };