From 9cc6dd350b9911050fc568053360753d5a229a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=BF=E8=AF=BA?= <1322522027@qq.com>
Date: Mon, 14 Oct 2024 10:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E8=B4=A6=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicWePay.php  |  4 ++--
 WePay/Refund.php                 |  4 ++--
 WePayV3/Contracts/BasicWePay.php |  1 -
 WePayV3/ProfitSharing.php        | 26 ++++++++++++++++++++------
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/WeChat/Contracts/BasicWePay.php b/WeChat/Contracts/BasicWePay.php
index 5697485..097b0ab 100644
--- a/WeChat/Contracts/BasicWePay.php
+++ b/WeChat/Contracts/BasicWePay.php
@@ -92,13 +92,13 @@ class BasicWePay
 
     /**
      * 获取微信支付通知
-     * @param string $xml
+     * @param string|array $xml
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
     public function getNotify($xml = '')
     {
-        $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml);
+        $data = is_array($xml) ? $xml : Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml);
         if (isset($data['sign']) && $this->getPaySign($data) === $data['sign']) {
             return $data;
         }
diff --git a/WePay/Refund.php b/WePay/Refund.php
index 14c61b0..4f068cb 100644
--- a/WePay/Refund.php
+++ b/WePay/Refund.php
@@ -57,14 +57,14 @@ class Refund extends BasicWePay
 
     /**
      * 获取退款通知
-     * @param string $xml
+     * @param string|array $xml
      * @return array
      * @throws \WeChat\Exceptions\InvalidDecryptException
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
     public function getNotify($xml = '')
     {
-        $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml);
+        $data = is_array($xml) ? $xml : Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml);
         if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') {
             throw new InvalidResponseException('获取退款通知XML失败！');
         }
diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index c271c4c..9e7e0fd 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -180,7 +180,6 @@ abstract class BasicWePay
                 "Wechatpay-Serial: {$this->config['mp_cert_serial']}"
             ],
         ]);
-
         if ($verify) {
             $headers = [];
             foreach (explode("\n", $header) as $line) {
diff --git a/WePayV3/ProfitSharing.php b/WePayV3/ProfitSharing.php
index 81b5cf5..aa2e405 100644
--- a/WePayV3/ProfitSharing.php
+++ b/WePayV3/ProfitSharing.php
@@ -31,7 +31,7 @@ class ProfitSharing extends BasicWePay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function create($options)
+    public function create(array $options)
     {
         $options['appid'] = $this->config['appid'];
         return $this->doRequest('POST', '/v3/profitsharing/orders', json_encode($options, JSON_UNESCAPED_UNICODE), true);
@@ -45,7 +45,7 @@ class ProfitSharing extends BasicWePay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function query($outOrderNo, $transactionId)
+    public function query(string $outOrderNo, string $transactionId)
     {
         $pathinfo = "/v3/profitsharing/orders/{$outOrderNo}?&transaction_id={$transactionId}";
         return $this->doRequest('GET', $pathinfo, '', true);
@@ -57,7 +57,7 @@ class ProfitSharing extends BasicWePay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function unfreeze($options)
+    public function unfreeze(array $options)
     {
         return $this->doRequest('POST', '/v3/profitsharing/orders/unfreeze', json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
@@ -68,7 +68,7 @@ class ProfitSharing extends BasicWePay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function amounts($transactionId)
+    public function amounts(string $transactionId)
     {
         $pathinfo = "/v3/profitsharing/transactions/{$transactionId}/amounts";
         return $this->doRequest('GET', $pathinfo, '', true);
@@ -80,9 +80,12 @@ class ProfitSharing extends BasicWePay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function addReceiver($options)
+    public function addReceiver(array $options)
     {
         $options['appid'] = $this->config['appid'];
+        if (isset($options['name'])) {
+            $options['name'] = $this->rsaEncode($options['name']);
+        }
         return $this->doRequest('POST', "/v3/profitsharing/receivers/add", json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
 
@@ -92,9 +95,20 @@ class ProfitSharing extends BasicWePay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function deleteReceiver($options)
+    public function deleteReceiver(array $options)
     {
         $options['appid'] = $this->config['appid'];
         return $this->doRequest('POST', "/v3/profitsharing/receivers/delete", json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
+    /**
+     * 请求分账回退
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function backspace(array $options)
+    {
+        $options['appid'] = $this->config['appid'];
+        return $this->doRequest('POST', "/v3/profitsharing/return-orders", json_encode($options, JSON_UNESCAPED_UNICODE), true);
+    }
 }