test: 增加epay测试用例&修复测试用例发现的的问题

yansongda · Jun 17, 2024 · 1f5f035 · 1f5f035
1 parent f0f4c7c
commit 1f5f035
Show file tree

Hide file tree

Showing 10 changed files with 165 additions and 120 deletions.
diff --git a/src/Plugin/Epay/CallbackPlugin.php b/src/Plugin/Epay/CallbackPlugin.php
@@ -6,6 +6,7 @@
 
 use Closure;
 use Yansongda\Artful\Contract\PluginInterface;
+use Yansongda\Artful\Direction\NoHttpRequestDirection;
 use Yansongda\Artful\Exception\InvalidConfigException;
 use Yansongda\Artful\Exception\InvalidParamsException;
 use Yansongda\Artful\Exception\InvalidResponseException;
@@ -25,7 +26,7 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
         $this->formatRequestAndParams($rocket);
 
         $params = $rocket->getParams();
-        $config = get_provider_config('alipay', $params);
+        $config = get_provider_config('epay', $params);
 
         $payload = $rocket->getPayload();
         $signature = $payload->get('sign');
@@ -35,7 +36,8 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
 
         $this->verifySign($config, $payload, $signature);
 
-        $rocket->setDestination($rocket->getPayload());
+        $rocket->setDirection(NoHttpRequestDirection::class)
+			->setDestination($rocket->getPayload());
 
         Logger::info('[epay][CallbackPlugin] 插件装载完毕', ['rocket' => $rocket]);
 

diff --git a/src/Plugin/Epay/GeneralPlugin.php b/src/Plugin/Epay/GeneralPlugin.php
diff --git a/src/Plugin/Epay/Pay/Scan/CancelPlugin.php b/src/Plugin/Epay/Pay/Scan/CancelPlugin.php
diff --git a/src/Plugin/Epay/Pay/Scan/PrepayPlugin.php b/src/Plugin/Epay/Pay/Scan/PrepayPlugin.php
@@ -4,41 +4,39 @@
 
 namespace Yansongda\Pay\Plugin\Epay\Pay\Scan;
 
-use Yansongda\Artful\Exception\ContainerException;
+use Closure;
+use Yansongda\Artful\Contract\PluginInterface;
 use Yansongda\Artful\Exception\InvalidConfigException;
-use Yansongda\Artful\Exception\ServiceNotFoundException;
+use Yansongda\Artful\Logger;
 use Yansongda\Artful\Rocket;
 use Yansongda\Pay\Exception\Exception;
-use Yansongda\Pay\Plugin\Epay\GeneralPlugin;
 
 use function Yansongda\Pay\get_provider_config;
 
-class PrepayPlugin extends GeneralPlugin
+class PrepayPlugin implements PluginInterface
 {
-    protected function getService(): string
+    public function assembly(Rocket $rocket, Closure $next): Rocket
     {
-        return 'atPay';
-    }
+        Logger::debug('[Epay][Pay][Scan][PrepayPlugin] 插件开始装载', ['rocket' => $rocket]);
 
-    /**
-     * @throws ServiceNotFoundException
-     * @throws ContainerException
-     */
-    protected function doSomethingBefore(Rocket $rocket): void
-    {
-        if (!empty($rocket->getPayload()['notify_url'])) {
-            return;
-        }
+        $backUrl = $rocket->getPayload()['notify_url'] ?? null;
+        if (empty($backUrl)) {
+            $params = $rocket->getParams();
+            $config = get_provider_config('epay', $params);
 
-        $params = $rocket->getParams();
-        $config = get_provider_config('epay', $params);
+            $backUrl = $config['notify_url'] ?? null;
+        }
 
-        $backUrl = $config['notify_url'] ?? null;
         if (!$backUrl) {
             throw new InvalidConfigException(Exception::CONFIG_EPAY_INVALID, 'Missing Epay Config -- [notify_url]');
         }
         $rocket->mergePayload([
+            'service' => 'atPay',
             'backUrl' => $backUrl,
         ]);
+
+        Logger::info('[Epay][Pay][Scan][PrepayPlugin] 插件装载完毕', ['rocket' => $rocket]);
+
+        return $next($rocket);
     }
 }
diff --git a/src/Plugin/Epay/Pay/Scan/QueryPlugin.php b/src/Plugin/Epay/Pay/Scan/QueryPlugin.php
@@ -4,20 +4,24 @@
 
 namespace Yansongda\Pay\Plugin\Epay\Pay\Scan;
 
+use Closure;
+use Yansongda\Artful\Contract\PluginInterface;
+use Yansongda\Artful\Logger;
 use Yansongda\Artful\Rocket;
-use Yansongda\Pay\Plugin\Epay\GeneralPlugin;
 
-class QueryPlugin extends GeneralPlugin
+class QueryPlugin implements PluginInterface
 {
-    protected function getService(): string
+    public function assembly(Rocket $rocket, Closure $next): Rocket
     {
-        return 'payCheck';
-    }
+        Logger::debug('[Epay][Pay][Scan][QueryPlugin] 插件开始装载', ['rocket' => $rocket]);
 
-    protected function doSomethingBefore(Rocket $rocket): void
-    {
         $rocket->mergePayload([
             'deviceNo' => '1234567890',
+            'service' => 'payCheck',
         ]);
+
+        Logger::info('[Epay][Pay][Scan][QueryPlugin] 插件装载完毕', ['rocket' => $rocket]);
+
+        return $next($rocket);
     }
 }
diff --git a/src/Plugin/Epay/Pay/Scan/RefundPlugin.php b/src/Plugin/Epay/Pay/Scan/RefundPlugin.php
@@ -4,20 +4,24 @@
 
 namespace Yansongda\Pay\Plugin\Epay\Pay\Scan;
 
+use Closure;
+use Yansongda\Artful\Contract\PluginInterface;
+use Yansongda\Artful\Logger;
 use Yansongda\Artful\Rocket;
-use Yansongda\Pay\Plugin\Epay\GeneralPlugin;
 
-class RefundPlugin extends GeneralPlugin
+class RefundPlugin implements PluginInterface
 {
-    protected function getService(): string
+    public function assembly(Rocket $rocket, Closure $next): Rocket
     {
-        return 'payRefund';
-    }
+        Logger::debug('[Epay][Pay][Scan][RefundPlugin] 插件开始装载', ['rocket' => $rocket]);
 
-    protected function doSomethingBefore(Rocket $rocket): void
-    {
         $rocket->mergePayload([
             'deviceNo' => '1234567890',
+            'service' => 'payRefund',
         ]);
+
+        Logger::info('[Epay][Pay][Scan][RefundPlugin] 插件装载完毕', ['rocket' => $rocket]);
+
+        return $next($rocket);
     }
 }
diff --git a/src/Plugin/Epay/StartPlugin.php b/src/Plugin/Epay/StartPlugin.php
@@ -7,6 +7,7 @@
 use Closure;
 use Yansongda\Artful\Contract\PluginInterface;
 use Yansongda\Artful\Logger;
+use Yansongda\Artful\Packer\QueryPacker;
 use Yansongda\Artful\Rocket;
 use Yansongda\Pay\Exception\ContainerException;
 use Yansongda\Pay\Exception\InvalidConfigException;
@@ -29,7 +30,7 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
         $params = $rocket->getParams();
         $config = get_provider_config('epay', $params);
 
-        $rocket->mergePayload(array_merge(
+        $rocket->setPacker(QueryPacker::class)->mergePayload(array_merge(
             $params,
             [
                 'createData' => date('Ymd'),

diff --git a/src/Provider/Epay.php b/src/Provider/Epay.php
@@ -66,11 +66,7 @@ public function mergeCommonPlugins(array $plugins): array
 
     public function cancel($order): Collection|Rocket
     {
-        $order = is_array($order) ? $order : ['outTradeNo' => $order];
-
-        Event::dispatch(new MethodCalled('epay', __METHOD__, $order, null));
-
-        return $this->__call('cancel', [$order]);
+		throw new InvalidParamsException(Exception::PARAMS_METHOD_NOT_SUPPORTED, 'Epay does not support cancel api');
     }
 
     public function close($order): Collection|Rocket
@@ -89,7 +85,7 @@ public function callback(null|array|ServerRequestInterface $contents = null, ?ar
     {
         $request = $this->getCallbackParams($contents);
 
-        Event::dispatch(new CallbackReceived('epay', $request, $params, null));
+        Event::dispatch(new CallbackReceived('epay', $request->all(), $params, null));
 
         return $this->pay(
             [CallbackPlugin::class],

diff --git a/src/Shortcut/Epay/CancelShortcut.php b/src/Shortcut/Epay/CancelShortcut.php