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

yansongda · web-flow · commit df334dd7666d · 2024-06-16T16:40:37.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### fixed
 
-- fix: 微信关闭订单报解包错误的问题(#1000)
+- fix: 微信关闭订单报解包错误的问题(#1000, #1001)
 
 ## v3.7.5
 
diff --git a/src/Plugin/Wechat/V3/Pay/App/ClosePlugin.php b/src/Plugin/Wechat/V3/Pay/App/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(
+                [
+                    '_url' => 'v3/pay/transactions/out-trade-no/'.$outTradeNo.'/close',
+                    '_service_url' => 'v3/pay/partner/transactions/out-trade-no/'.$outTradeNo.'/close',
+                    '_method' => 'POST',
+                ],
+                $data ?? $this->normal($config)
+            ));
 
         Logger::info('[Wechat][V3][Pay][App][ClosePlugin] 插件装载完毕', ['rocket' => $rocket]);
 
diff --git a/src/Plugin/Wechat/V3/Pay/Combine/ClosePlugin.php b/src/Plugin/Wechat/V3/Pay/Combine/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;
@@ -40,12 +41,14 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
             throw new InvalidParamsException(Exception::PARAMS_NECESSARY_PARAMS_MISSING, '参数异常: 合单关单，参数缺少 `combine_out_trade_no`');
         }
 
-        $rocket->mergePayload([
-            '_method' => 'POST',
-            '_url' => 'v3/combine-transactions/out-trade-no/'.$combineOutTradeNo.'/close',
-            '_service_url' => 'v3/combine-transactions/out-trade-no/'.$combineOutTradeNo.'/close',
-            'combine_appid' => $payload->get('combine_appid', $config[get_wechat_type_key($params)] ?? ''),
-        ])->exceptPayload('combine_out_trade_no');
+        $rocket->setDirection(OriginResponseDirection::class)
+            ->mergePayload([
+                '_method' => 'POST',
+                '_url' => 'v3/combine-transactions/out-trade-no/'.$combineOutTradeNo.'/close',
+                '_service_url' => 'v3/combine-transactions/out-trade-no/'.$combineOutTradeNo.'/close',
+                'combine_appid' => $payload->get('combine_appid', $config[get_wechat_type_key($params)] ?? ''),
+            ])
+            ->exceptPayload('combine_out_trade_no');
 
         Logger::info('[Wechat][Pay][Combine][ClosePlugin] 插件装载完毕', ['rocket' => $rocket]);
 
diff --git a/src/Plugin/Wechat/V3/Pay/H5/ClosePlugin.php b/src/Plugin/Wechat/V3/Pay/H5/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][V3][Pay][H5][ClosePlugin] 插件装载完毕', ['rocket' => $rocket]);
 
diff --git a/src/Plugin/Wechat/V3/Pay/Mini/ClosePlugin.php b/src/Plugin/Wechat/V3/Pay/Mini/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][Mini][ClosePlugin] 插件装载完毕', ['rocket' => $rocket]);
 
diff --git a/src/Plugin/Wechat/V3/Pay/Native/ClosePlugin.php b/src/Plugin/Wechat/V3/Pay/Native/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][Native][ClosePlugin] 插件装载完毕', ['rocket' => $rocket]);
 
diff --git a/tests/Plugin/Wechat/V3/Pay/App/ClosePluginTest.php b/tests/Plugin/Wechat/V3/Pay/App/ClosePluginTest.php
@@ -2,6 +2,7 @@
 
 namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\App;
 
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\Wechat\V3\Pay\App\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());
     }
 }
diff --git a/tests/Plugin/Wechat/V3/Pay/Combine/ClosePluginTest.php b/tests/Plugin/Wechat/V3/Pay/Combine/ClosePluginTest.php
@@ -2,6 +2,7 @@
 
 namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\Combine;
 
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\Wechat\V3\Pay\Combine\ClosePlugin;
@@ -49,6 +50,7 @@ public function testNormalParams()
             'combine_appid' => '333',
             'name' => 'yansongda',
         ], $result->getPayload()->all());
+        self::assertEquals(OriginResponseDirection::class, $result->getDirection());
     }
 
     public function testNormal()
@@ -66,5 +68,6 @@ public function testNormal()
             '_service_url' => 'v3/combine-transactions/out-trade-no/111/close',
             'combine_appid' => 'wx55955316af4ef13',
         ], $result->getPayload()->all());
+        self::assertEquals(OriginResponseDirection::class, $result->getDirection());
     }
 }
diff --git a/tests/Plugin/Wechat/V3/Pay/H5/ClosePluginTest.php b/tests/Plugin/Wechat/V3/Pay/H5/ClosePluginTest.php
@@ -2,6 +2,7 @@
 
 namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\H5;
 
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\Wechat\V3\Pay\H5\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());
     }
 }
diff --git a/tests/Plugin/Wechat/V3/Pay/Mini/ClosePluginTest.php b/tests/Plugin/Wechat/V3/Pay/Mini/ClosePluginTest.php
@@ -2,6 +2,7 @@
 
 namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\Mini;
 
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\Wechat\V3\Pay\Mini\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());
     }
 }
diff --git a/tests/Plugin/Wechat/V3/Pay/Native/ClosePluginTest.php b/tests/Plugin/Wechat/V3/Pay/Native/ClosePluginTest.php
@@ -2,6 +2,7 @@
 
 namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\Native;
 
+use Yansongda\Artful\Direction\OriginResponseDirection;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\Wechat\V3\Pay\Native\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());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Yansongda\Pay\Tests\Plugin\Wechat\V3\Pay\App;`
`4`	`4`
	`5`	`+use Yansongda\Artful\Direction\OriginResponseDirection;`
`5`	`6`	`use Yansongda\Pay\Exception\Exception;`
`6`	`7`	`use Yansongda\Artful\Exception\InvalidParamsException;`
`7`	`8`	`use Yansongda\Pay\Plugin\Wechat\V3\Pay\App\ClosePlugin;`
`@@ -46,6 +47,7 @@ public function testNormal()`
`46`	`47`	`'_service_url' => 'v3/pay/partner/transactions/out-trade-no/111/close',`
`47`	`48`	`'mchid' => '1600314069',`
`48`	`49`	`], $result->getPayload()->all());`
	`50`	`+ self::assertEquals(OriginResponseDirection::class, $result->getDirection());`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`public function testServiceParams()`
`@@ -65,6 +67,7 @@ public function testServiceParams()`
`65`	`67`	`'sp_mchid' => '1600314069',`
`66`	`68`	`'sub_mchid' => '333',`
`67`	`69`	`], $result->getPayload()->all());`
	`70`	`+ self::assertEquals(OriginResponseDirection::class, $result->getDirection());`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`public function testService()`
`@@ -83,5 +86,6 @@ public function testService()`
`83`	`86`	`'sp_mchid' => '1600314069',`
`84`	`87`	`'sub_mchid' => '1600314070',`
`85`	`88`	`], $result->getPayload()->all());`
	`89`	`+ self::assertEquals(OriginResponseDirection::class, $result->getDirection());`
`86`	`90`	`}`
`87`	`91`	`}`