From 328d21d32c3d06f5f050185a740f00fe475b6a03 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 12 Sep 2018 14:12:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=9C=8D=E5=8E=BB=E9=99=A4=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Custom.php | 11 ++++-------
 WePay/Refund.php  | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/WeChat/Custom.php b/WeChat/Custom.php
index 8f1c9d7..12e5051 100644
--- a/WeChat/Custom.php
+++ b/WeChat/Custom.php
@@ -44,14 +44,13 @@ class Custom extends BasicWeChat
      * 修改客服帐号
      * @param string $kf_account 客服账号
      * @param string $nickname 客服昵称
-     * @param string $password 账号密码
      * @return array
      * @throws Exceptions\InvalidResponseException
      * @throws Exceptions\LocalCacheException
      */
-    public function updateAccount($kf_account, $nickname, $password)
+    public function updateAccount($kf_account, $nickname)
     {
-        $data = ['kf_account' => $kf_account, 'nickname' => $nickname, 'password' => $password];
+        $data = ['kf_account' => $kf_account, 'nickname' => $nickname];
         $url = "https://api.weixin.qq.com/customservice/kfaccount/update?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);
@@ -60,15 +59,13 @@ class Custom extends BasicWeChat
     /**
      * 删除客服帐号
      * @param string $kf_account 客服账号
-     * @param string $nickname 客服昵称
-     * @param string $password 账号密码
      * @return array
      * @throws Exceptions\InvalidResponseException
      * @throws Exceptions\LocalCacheException
      */
-    public function deleteAccount($kf_account, $nickname, $password)
+    public function deleteAccount($kf_account)
     {
-        $data = ['kf_account' => $kf_account, 'nickname' => $nickname, 'password' => $password];
+        $data = ['kf_account' => $kf_account];
         $url = "https://api.weixin.qq.com/customservice/kfaccount/del?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);
diff --git a/WePay/Refund.php b/WePay/Refund.php
index a91493e..da81522 100644
--- a/WePay/Refund.php
+++ b/WePay/Refund.php
@@ -15,6 +15,8 @@
 namespace WePay;
 
 use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 微信商户退款
@@ -48,4 +50,27 @@ class Refund extends BasicPay
         return $this->callPostApi($url, $options);
     }
 
+    /**
+     * 获取退款通知
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function getNotify()
+    {
+        $data = Tools::xml2arr(file_get_contents("php://input"));
+        if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') {
+            throw new InvalidResponseException('获取退款通知XML失败！');
+        }
+        if (!class_exists('Prpcrypt', false)) {
+            include dirname(__DIR__) . '/WeChat/Contracts/Prpcrypt.php';
+        }
+        $pc = new \Prpcrypt(md5($this->config->get('mch_key')));
+        $array = $pc->decrypt(base64_decode($data['req_info']));
+        if (intval($array[0]) > 0) {
+            throw new InvalidResponseException($array[1], $array[0]);
+        }
+        $data['decode'] = $array[1];
+        return $data;
+    }
+
 }
\ No newline at end of file