optimize: 优化预下单失败时错误提示 (#814)

yansongda · Jun 24, 2023 · da90865 · da90865
1 parent 7188d6a
commit da90865
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v3.4.1
+
+### optimized
+
+- optimize: 优化无签名时错误提示(#813)
+- optimize: 优化预下单失败时错误提示(#814)
+
 ## v3.4.0
 
 ### added

diff --git a/src/Plugin/Wechat/Pay/Common/InvokePrepayPlugin.php b/src/Plugin/Wechat/Pay/Common/InvokePrepayPlugin.php
@@ -35,12 +35,14 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
 
         Logger::debug('[wechat][InvokePrepayPlugin] 插件开始装载', ['rocket' => $rocket]);
 
-        $prepayId = $rocket->getDestination()->get('prepay_id');
+        $destination = $rocket->getDestination();
+
+        $prepayId = $destination->get('prepay_id');
 
         if (is_null($prepayId)) {
-            Logger::error('[wechat][InvokePrepayPlugin] 预下单失败：响应缺少 prepay_id 参数，请自行检查参数是否符合微信要求', $rocket->getDestination()->all());
+            Logger::error('[wechat][InvokePrepayPlugin] 预下单失败：响应缺少 prepay_id 参数，请自行检查参数是否符合微信要求', $destination->all());
 
-            throw new InvalidResponseException(Exception::RESPONSE_MISSING_NECESSARY_PARAMS, 'Prepay Response Error: Missing PrepayId', $rocket->getDestination()->all());
+            throw new InvalidResponseException(Exception::RESPONSE_MISSING_NECESSARY_PARAMS, $destination->get('message', '预下单失败：响应缺少 prepay_id 参数，请自行检查参数是否符合微信要求'), $destination->all());
         }
 
         $config = $this->getInvokeConfig($rocket, $prepayId);