This commit is contained in:
xl
2023-11-14 09:29:44 +08:00
parent dfc59ab88d
commit a0fc4d5a30
+4 -4
View File
@@ -46,9 +46,9 @@ trait WxV3PaymentTait
{ {
$payConfig = $this->getPayConfig(); $payConfig = $this->getPayConfig();
if ($payConfig->typeIsApp()) { if ($payConfig->typeIsApp()) {
$body['appid'] = $payConfig->pay->wx->appId; $body['appid'] = $payConfig->pay->wx->appId;
} else { } else {
$body['appid'] = $payConfig->appId; $body['appid'] = $payConfig->appId;
} }
$body['mchid'] = $payConfig->pay->wx->mchId; $body['mchid'] = $payConfig->pay->wx->mchId;
$body['description'] = $payConfig->getBody(); $body['description'] = $payConfig->getBody();
@@ -71,8 +71,8 @@ trait WxV3PaymentTait
->withContentType('application/json')->withAddedHeader('User-Agent', 'application/json') ->withContentType('application/json')->withAddedHeader('User-Agent', 'application/json')
->withBody($json)->withAddedHeader("Accept", "*/*"); ->withBody($json)->withAddedHeader("Accept", "*/*");
$proxyHost = $this->getConfig()->getProxyHost(); $proxyHost = $this->getPayConfig()->getProxyHost();
$proxyPort = $this->getConfig()->getProxyPort(); $proxyPort = $this->getPayConfig()->getProxyPort();
if (!empty($proxyHost) && $proxyPort > 0) { if (!empty($proxyHost) && $proxyPort > 0) {
$client->withProxyHost($proxyHost)->withProxyPort($proxyPort); $client->withProxyHost($proxyHost)->withProxyPort($proxyPort);
} }