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 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E9=80=80=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);
+    }
 }

From be71c30b210c62e1cc0d57ba996b84f6cd344e8a 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:14:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E6=B6=88=E8=B4=B9=E8=80=85=E6=8A=95=E8=AF=892.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Complaints.php | 144 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 WePayV3/Complaints.php

diff --git a/WePayV3/Complaints.php b/WePayV3/Complaints.php
new file mode 100644
index 0000000..f4e9659
--- /dev/null
+++ b/WePayV3/Complaints.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace WePayV3;
+
+use WePayV3\Contracts\BasicWePay;
+/**
+ * 普通商户消费者投诉2.0
+ * Class Complaints
+ * @package WePayV3
+ */
+class Complaints extends BasicWePay
+{
+
+    /**
+     * 查询投诉列表
+     * @param int $offset 分页开始位置
+     * @param int $limit 分页大小
+     * @param String $begin_date 开始日期
+     * @param String $end_date 结束日期
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function complaintList(int $offset = 0, int $limit = 10, String $begin_date, String $end_date)
+    {
+        $mchId = $this->config['mch_id'];
+        $pathinfo = "/v3/merchant-service/complaints-v2?limit={$limit}&offset={$offset}&begin_date={$begin_date}&end_date={$end_date}&complainted_mchid={$mchId}";
+        return  $this->doRequest('GET', $pathinfo,'', true);
+    }
+
+    /**
+     * 查询投诉详情
+     * @param String $complaint_id  被投诉单号
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function  complaintDetails(String $complaint_id)
+    {
+        $pathinfo = "/v3/merchant-service/complaints-v2/{$complaint_id}";
+        return $this->doRequest('GET', $pathinfo,'', true);
+    }
+
+    /**
+     * 查询投诉协商历史
+     * @param String $complaint_id  被投诉单号
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function negotiationHistory(String $complaint_id)
+    {
+        $pathinfo = "/v3/merchant-service/complaints-v2/{$complaint_id}/negotiation-historys";
+        return $this->doRequest('GET', $pathinfo,'', true);
+    }
+
+    /**
+     * 创建投诉通知回调地址
+     * @param String $url 回调通知地址
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function CreateComplaintsNotify(String $url)
+    {
+        return $this->doRequest('POST', '/v3/merchant-service/complaint-notifications', json_encode(['url' => $url],JSON_UNESCAPED_UNICODE), true);
+
+    }
+
+    /**
+     * 查询投诉通知回调地址
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function queryComplaintsNotify()
+    {
+        return $this->doRequest('GET', '/v3/merchant-service/complaint-notifications', '', true);
+
+    }
+
+    /**
+     * 更新投诉通知回调地址
+     * @param String $url 回调通知地址
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function updateComplaintsNotify(String $url){
+        return $this->doRequest('PUT', '/v3/merchant-service/complaint-notifications', json_encode(['url' => $url],JSON_UNESCAPED_UNICODE), true);
+    }
+
+    /**
+     * 删除投诉通知回调地址
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function deleteComplaintsNotify(){
+        return $this->doRequest('DELETE', '/v3/merchant-service/complaint-notifications', '', true);
+    }
+
+    /**
+     * 回复投诉
+     * @param String $complaint_id 被投诉单号
+     * @param String $content 回复内容
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function replyInfo(String $complaint_id, String $content)
+    {
+        $content['complainted_mchid'] = $this->config['mch_id'];
+        $pathinfo = "/v3/merchant-service/complaints-v2/{$complaint_id}/response";
+        return $this->doRequest('POST', $pathinfo, json_encode($content,JSON_UNESCAPED_UNICODE), true);
+    }
+
+    /**
+     * 反馈处理完成
+     * @param string $complaint_id 被投诉单号
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function completeComplaints(string $complaint_id)
+    {
+        $mchId = $this->config['mch_id'];
+        $pathinfo = "/v3/merchant-service/complaints-v2/{$complaint_id}/complete";
+        return $this->doRequest('POST', $pathinfo, json_encode(['complainted_mchid' => $mchId],JSON_UNESCAPED_UNICODE),true);
+    }
+
+    /**
+     * 图片请求接口
+     * @param $pathinfo
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function downLoadImg(string $pathinfo)
+    {
+        return $this->doRequest('GET', $pathinfo, '',true,false);
+    }
+    /**
+     * 图片上传接口
+     * @param $imginfo
+     * @return array|string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function uploadImg(array $imginfo)
+    {
+        return $this->doRequest('POST', '/v3/merchant-service/images/upload', json_encode($imginfo,JSON_UNESCAPED_UNICODE),true);
+    }
+
+}
\ No newline at end of file

From a044045abe5c23bf620b8aa3ec2b65436d3e1368 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 11:07:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Complaints.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WePayV3/Complaints.php b/WePayV3/Complaints.php
index f4e9659..588370b 100644
--- a/WePayV3/Complaints.php
+++ b/WePayV3/Complaints.php
@@ -100,7 +100,7 @@ class Complaints extends BasicWePay
      * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function replyInfo(String $complaint_id, String $content)
+    public function replyInfo(String $complaint_id, array $content)
     {
         $content['complainted_mchid'] = $this->config['mch_id'];
         $pathinfo = "/v3/merchant-service/complaints-v2/{$complaint_id}/response";