blackteay/WeChatDeveloper
1
0
Fork 0
mirror of https://gitee.com/zoujingli/WeChatDeveloper.git synced 2025-04-06 03:58:03 +08:00
Code Issues Projects Releases Wiki Activity

同步更新退款通知处理

Browse Source
This commit is contained in:
邹景立 2023-07-13 19:57:13 +08:00
parent 6fabf8a9e3
commit c361075864
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
We.php
View File

@ -93,7 +93,7 @@ class We
* 定义当前版本 * 定义当前版本
* @var string * @var string
*/ */
const VERSION = '1.2.47'; const VERSION = '1.2.48';
/** /**
* 静态配置 * 静态配置

21
WePayV3/Order.php
View File

@ -18,7 +18,6 @@ namespace WePayV3;
use WeChat\Contracts\Tools; use WeChat\Contracts\Tools;
use WeChat\Exceptions\InvalidArgumentException; use WeChat\Exceptions\InvalidArgumentException;
use WeChat\Exceptions\InvalidDecryptException;
use WeChat\Exceptions\InvalidResponseException; use WeChat\Exceptions\InvalidResponseException;
use WePayV3\Contracts\BasicWePay; use WePayV3\Contracts\BasicWePay;
use WePayV3\Contracts\DecryptAes; use WePayV3\Contracts\DecryptAes;
@ -153,26 +152,14 @@ class Order extends BasicWePay
/** /**
* 获取退款通知 * 获取退款通知
* @param string $xml * @param mixed $data
* @return array
* @return array * @return array
* @throws \WeChat\Exceptions\InvalidDecryptException * @throws \WeChat\Exceptions\InvalidDecryptException
* @throws \WeChat\Exceptions\InvalidResponseException * @deprecated 直接使用 Notify 方法
*/ */
public function notifyRefund($xml = '') public function notifyRefund($data = [])
{ {
$data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml); return $this->notify($data);
if (empty($data['return_code']) || $data['return_code'] !== 'SUCCESS') {
throw new InvalidResponseException('获取退款通知失败！');
}
try {
$decrypt = base64_decode($data['req_info']);
$response = openssl_decrypt($decrypt, 'aes-256-ecb', md5($this->config['mch_v3_key']), OPENSSL_RAW_DATA);
$data['result'] = Tools::xml2arr($response);
return $data;
} catch (\Exception $exception) {
throw new InvalidDecryptException($exception->getMessage(), $exception->getCode());
}
} }
/** /**

10
WePayV3/Refund.php
View File

@ -32,6 +32,7 @@ class Refund extends BasicWePay
* @param array $data 退款参数 * @param array $data 退款参数
* @return array * @return array
* @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/ */
public function create($data) public function create($data)
{ {
@ -44,6 +45,7 @@ class Refund extends BasicWePay
* @param string $refundNo 退款单号 * @param string $refundNo 退款单号
* @return array * @return array
* @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/ */
public function query($refundNo) public function query($refundNo)
{ {
@ -54,15 +56,15 @@ class Refund extends BasicWePay
/** /**
* 获取退款通知 * 获取退款通知
* @param string $xml * @param mixed $xml
* @return array
* @return array * @return array
* @throws \WeChat\Exceptions\InvalidDecryptException * @throws \WeChat\Exceptions\InvalidDecryptException
* @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/ */
public function notify($xml = '') public function notify($xml = [])
{ {
return Order::instance($this->config)->notifyRefund($xml); return Order::instance($this->config)->notify($xml);
// $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml); // $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml);
// if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') { // if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') {
// throw new InvalidResponseException('获取退款通知XML失败！'); // throw new InvalidResponseException('获取退款通知XML失败！');