mirror of
https://gitee.com/zoujingli/WeChatDeveloper.git
synced 2025-04-05 09:52:47 +08:00
修改V3接口参数
This commit is contained in:
Anyon
parent
0c01bd0761
commit
0646ff3bb9
@ -426,7 +426,7 @@ class Tools
|
||||
return call_user_func_array(self::$cache_callable['get'], func_get_args());
|
||||
}
|
||||
$file = self::_getCacheName($name);
|
||||
if (file_exists($file) && ($content = file_get_contents($file))) {
|
||||
if (file_exists($file) && is_file($file) && ($content = file_get_contents($file))) {
|
||||
$data = unserialize($content);
|
||||
if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
|
||||
return $data['value'];
|
||||
|
||||
@ -45,6 +45,7 @@ abstract class BasicWePay
|
||||
* @var array
|
||||
*/
|
||||
protected $config = [
|
||||
'appid' => '', // 微信绑定APPID，需配置
|
||||
'mch_id' => '', // 微信商户编号，需要配置
|
||||
'mch_v3_key' => '', // 微信商户密钥，需要配置
|
||||
'cert_serial' => '', // 商户证书序号，无需配置
|
||||
@ -71,6 +72,7 @@ abstract class BasicWePay
|
||||
throw new InvalidArgumentException("Missing Config -- [cert_public]");
|
||||
}
|
||||
|
||||
$this->config['appid'] = isset($options['appid']) ? $options['appid'] : '';
|
||||
$this->config['mch_id'] = $options['mch_id'];
|
||||
$this->config['mch_v3_key'] = $options['mch_v3_key'];
|
||||
$this->config['cert_public'] = $options['cert_public'];
|
||||
@ -102,7 +104,6 @@ abstract class BasicWePay
|
||||
* @param bool $verify 是否验证
|
||||
* @return array
|
||||
* @throws InvalidResponseException
|
||||
* @throws LocalCacheException
|
||||
*/
|
||||
public function doRequest($method, $pathinfo, $jsondata = '', $verify = false)
|
||||
{
|
||||
@ -127,9 +128,13 @@ abstract class BasicWePay
|
||||
$headers[$keys] = trim($value);
|
||||
}
|
||||
}
|
||||
$string = join("\n", [$headers['timestamp'], $headers['nonce'], $content, '']);
|
||||
if (!$this->signVerify($string, $headers['signature'], $headers['serial'])) {
|
||||
throw new InvalidResponseException("验证响应签名失败");
|
||||
try {
|
||||
$string = join("\n", [$headers['timestamp'], $headers['nonce'], $content, '']);
|
||||
if (!$this->signVerify($string, $headers['signature'], $headers['serial'])) {
|
||||
throw new InvalidResponseException("验证响应签名失败");
|
||||
}
|
||||
} catch (\Exception $exception) {
|
||||
throw new InvalidResponseException($exception->getMessage(), $exception->getCode());
|
||||
}
|
||||
}
|
||||
return json_decode($content, true);
|
||||
@ -194,7 +199,7 @@ abstract class BasicWePay
|
||||
Cert::instance($this->config)->download();
|
||||
$cert = $this->tmpFile($serial);
|
||||
}
|
||||
return openssl_verify($data, base64_decode($sign), openssl_x509_read($cert), 'sha256WithRSAEncryption');
|
||||
return @openssl_verify($data, base64_decode($sign), openssl_x509_read($cert), 'sha256WithRSAEncryption');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -14,9 +14,9 @@
|
||||
|
||||
namespace WePayV3;
|
||||
|
||||
use WeChat\Contracts\Tools;
|
||||
use WeChat\Exceptions\InvalidArgumentException;
|
||||
use WeChat\Exceptions\InvalidResponseException;
|
||||
use WeChat\Exceptions\LocalCacheException;
|
||||
use WePayV3\Contracts\BasicWePay;
|
||||
|
||||
/**
|
||||
@ -34,12 +34,11 @@ class Order extends BasicWePay
|
||||
/**
|
||||
* 创建支付订单
|
||||
* @param string $type 支付类型
|
||||
* @param string $json 支付参数
|
||||
* @param array $data 支付参数
|
||||
* @return array
|
||||
* @throws InvalidResponseException
|
||||
* @throws LocalCacheException
|
||||
*/
|
||||
public function create($type, $json)
|
||||
public function create($type, $data)
|
||||
{
|
||||
$types = [
|
||||
'h5' => '/v3/pay/transactions/h5',
|
||||
@ -50,7 +49,23 @@ class Order extends BasicWePay
|
||||
if (empty($types[$type])) {
|
||||
throw new InvalidArgumentException("Payment {$type} not defined.");
|
||||
} else {
|
||||
return $this->doRequest('POST', $types[$type], $json, true);
|
||||
// 创建预支付码
|
||||
$result = $this->doRequest('POST', $types[$type], json_encode($data, JSON_UNESCAPED_UNICODE), true);
|
||||
if (empty($result['prepay_id'])) return $result;
|
||||
// 支付参数签名
|
||||
$time = (string)time();
|
||||
$appid = $this->config['appid'];
|
||||
$prepayId = $result['prepay_id'];
|
||||
$nonceStr = Tools::createNoncestr();
|
||||
if ($type === 'app') {
|
||||
$sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, $prepayId]));
|
||||
return ['partnerId' => $this->config['mch_id'], 'prepayId' => $prepayId, 'package' => 'Sign=WXPay', 'nonceStr' => $nonceStr, 'timeStamp' => $time, 'sign' => $sign];
|
||||
} elseif ($type === 'jsapi') {
|
||||
$sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, "prepay_id={$prepayId}"]));
|
||||
return ['appId' => $appid, 'timeStamp' => $time, 'nonceStr' => $nonceStr, 'package' => "prepay_id={$prepayId}", 'signType' => 'RSA', 'paySign' => $sign];
|
||||
} else {
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -59,7 +74,6 @@ class Order extends BasicWePay
|
||||
* @param string $orderNo 订单单号
|
||||
* @return array
|
||||
* @throws InvalidResponseException
|
||||
* @throws LocalCacheException
|
||||
*/
|
||||
public function query($orderNo)
|
||||
{
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
namespace WePayV3;
|
||||
|
||||
use WeChat\Exceptions\InvalidResponseException;
|
||||
use WeChat\Exceptions\LocalCacheException;
|
||||
use WePayV3\Contracts\BasicWePay;
|
||||
|
||||
/**
|
||||
@ -27,14 +26,13 @@ class Refund extends BasicWePay
|
||||
{
|
||||
/**
|
||||
* 创建退款订单
|
||||
* @param string $json 退款参数
|
||||
* @param array $data 退款参数
|
||||
* @return array
|
||||
* @throws InvalidResponseException
|
||||
* @throws LocalCacheException
|
||||
*/
|
||||
public function create($json)
|
||||
public function create($data)
|
||||
{
|
||||
return $this->doRequest('POST', '/v3/ecommerce/refunds/apply', $json, true);
|
||||
return $this->doRequest('POST', '/v3/ecommerce/refunds/apply', json_encode($data, JSON_UNESCAPED_UNICODE), true);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -42,7 +40,6 @@ class Refund extends BasicWePay
|
||||
* @param string $refundNo 退款单号
|
||||
* @return array
|
||||
* @throws InvalidResponseException
|
||||
* @throws LocalCacheException
|
||||
*/
|
||||
public function query($refundNo)
|
||||
{
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'appid' => '绑定的APPID',
|
||||
'mch_id' => '您的商户编号',
|
||||
'mch_v3_key' => '您的V3接口密码',
|
||||
'cert_public' => <<<EOF
|
||||
|
||||
@ -10,7 +10,7 @@ try {
|
||||
$payment = \WePayV3\Order::instance($config);
|
||||
|
||||
// 4. 组装支付参数
|
||||
$result = $payment->create('jsapi', json_encode([
|
||||
$result = $payment->create('jsapi', [
|
||||
'appid' => 'wx60a43dd8161666d4',
|
||||
'mchid' => $config['mch_id'],
|
||||
'description' => '商品描述',
|
||||
@ -18,10 +18,10 @@ try {
|
||||
'notify_url' => 'https://thinkadmin.top',
|
||||
'payer' => ['openid' => 'o38gps3vNdCqaggFfrBRCRikwlWY'],
|
||||
'amount' => ['total' => 1, 'currency' => 'CNY'],
|
||||
], JSON_UNESCAPED_UNICODE));
|
||||
]);
|
||||
|
||||
echo '<pre>';
|
||||
echo "\n--- 创建预支付码 ---\n";
|
||||
echo "\n--- 创建支付参数 ---\n";
|
||||
var_export($result);
|
||||
|
||||
} catch (\Exception $exception) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user