fix: 微信关闭订单报解包错误的问题 (#1000)

yansongda · Jun 16, 2024 · 1cbe8d8 · 1cbe8d8
1 parent 3d79403
commit 1cbe8d8
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v3.7.6
+
+### fixed
+
+- fix: 微信关闭订单报解包错误的问题(#1000)
+
 ## v3.7.5
 
 ### fixed

diff --git a/src/Plugin/Wechat/V3/Pay/Jsapi/ClosePlugin.php b/src/Plugin/Wechat/V3/Pay/Jsapi/ClosePlugin.php
@@ -6,6 +6,7 @@
 
 use Closure;
 use Yansongda\Artful\Contract\PluginInterface;
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Artful\Exception\ContainerException;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Artful\Exception\ServiceNotFoundException;
@@ -45,14 +46,15 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
             $data = $this->service($payload, $config);
         }
 
-        $rocket->setPayload(array_merge(
-            [
-                '_method' => 'POST',
-                '_url' => 'v3/pay/transactions/out-trade-no/'.$outTradeNo.'/close',
-                '_service_url' => 'v3/pay/partner/transactions/out-trade-no/'.$outTradeNo.'/close',
-            ],
-            $data ?? $this->normal($config)
-        ));
+        $rocket->setDirection(OriginResponseDirection::class)
+            ->setPayload(array_merge(
+                [
+                    '_method' => 'POST',
+                    '_url' => 'v3/pay/transactions/out-trade-no/'.$outTradeNo.'/close',
+                    '_service_url' => 'v3/pay/partner/transactions/out-trade-no/'.$outTradeNo.'/close',
+                ],
+                $data ?? $this->normal($config)
+            ));
 
         Logger::info('[Wechat][Pay][Jsapi][ClosePlugin] 插件装载完毕', ['rocket' => $rocket]);
 

diff --git a/src/Provider/Alipay.php b/src/Provider/Alipay.php
@@ -54,7 +54,7 @@ class Alipay implements ProviderInterface
      */
     public function __call(string $shortcut, array $params): null|Collection|MessageInterface|Rocket
     {
-        $plugin = '\\Yansongda\\Pay\\Shortcut\\Alipay\\'.Str::studly($shortcut).'Shortcut';
+        $plugin = '\Yansongda\Pay\Shortcut\Alipay\\'.Str::studly($shortcut).'Shortcut';
 
         return Artful::shortcut($plugin, ...$params);
     }

diff --git a/src/Provider/Unipay.php b/src/Provider/Unipay.php
@@ -51,7 +51,7 @@ class Unipay implements ProviderInterface
      */
     public function __call(string $shortcut, array $params): null|Collection|MessageInterface|Rocket
     {
-        $plugin = '\\Yansongda\\Pay\\Shortcut\\Unipay\\'.Str::studly($shortcut).'Shortcut';
+        $plugin = '\Yansongda\Pay\Shortcut\Unipay\\'.Str::studly($shortcut).'Shortcut';
 
         return Artful::shortcut($plugin, ...$params);
     }

diff --git a/src/Provider/Wechat.php b/src/Provider/Wechat.php
@@ -58,7 +58,7 @@ class Wechat implements ProviderInterface
      */
     public function __call(string $shortcut, array $params): null|Collection|MessageInterface
     {
-        $plugin = '\\Yansongda\\Pay\\Shortcut\\Wechat\\'.Str::studly($shortcut).'Shortcut';
+        $plugin = '\Yansongda\Pay\Shortcut\Wechat\\'.Str::studly($shortcut).'Shortcut';
 
         return Artful::shortcut($plugin, ...$params);
     }

diff --git a/tests/Plugin/Wechat/V3/Pay/Jsapi/ClosePluginTest.php b/tests/Plugin/Wechat/V3/Pay/Jsapi/ClosePluginTest.php
@@ -2,6 +2,7 @@
 
 namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\Jsapi;
 
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\Wechat\V3\Pay\Jsapi\ClosePlugin;
@@ -46,6 +47,7 @@ public function testNormal()
             '_service_url' => 'v3/pay/partner/transactions/out-trade-no/111/close',
             'mchid' => '1600314069',
         ], $result->getPayload()->all());
+        self::assertEquals(OriginResponseDirection::class, $result->getDirection());
     }
 
     public function testServiceParams()
@@ -65,6 +67,7 @@ public function testServiceParams()
             'sp_mchid' => '1600314069',
             'sub_mchid' => '333',
         ], $result->getPayload()->all());
+        self::assertEquals(OriginResponseDirection::class, $result->getDirection());
     }
 
     public function testService()
@@ -83,5 +86,6 @@ public function testService()
             'sp_mchid' => '1600314069',
             'sub_mchid' => '1600314070',
         ], $result->getPayload()->all());
+        self::assertEquals(OriginResponseDirection::class, $result->getDirection());
     }
 }