From 4ba213dceae358c028dd23a0572e0c85cb6be2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 15 Apr 2021 11:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E6=B5=B7?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                          | 2 +-
 WeChat/Contracts/BasicWePay.php | 5 +++--
 WePay/Custom.php                | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/We.php b/We.php
index 1fdfe2f..cf3c887 100644
--- a/We.php
+++ b/We.php
@@ -88,7 +88,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.29';
+    const VERSION = '1.2.30';
 
     /**
      * 静态配置
diff --git a/WeChat/Contracts/BasicWePay.php b/WeChat/Contracts/BasicWePay.php
index 46de39c..24a0e51 100644
--- a/WeChat/Contracts/BasicWePay.php
+++ b/WeChat/Contracts/BasicWePay.php
@@ -170,7 +170,7 @@ class BasicWePay
      * @throws InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
+    protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true, $needNonceStr = true)
     {
         $option = [];
         if ($isCert) {
@@ -192,7 +192,8 @@ class BasicWePay
             }
         }
         $params = $this->params->merge($data);
-        $needSignType && ($params['sign_type'] = strtoupper($signType));
+        if (!$needNonceStr) unset($params['nonce_str']);
+        if ($needSignType) $params['sign_type'] = strtoupper($signType);
         $params['sign'] = $this->getPaySign($params, $signType);
         $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
         if ($result['return_code'] !== 'SUCCESS') {
diff --git a/WePay/Custom.php b/WePay/Custom.php
index d2ec0b4..21fdb3c 100644
--- a/WePay/Custom.php
+++ b/WePay/Custom.php
@@ -34,7 +34,7 @@ class Custom extends BasicWePay
     public function add(array $options = [])
     {
         $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclareorder';
-        return $this->callPostApi($url, $options, false, 'MD5');
+        return $this->callPostApi($url, $options, false, 'MD5', false, false);
     }
 
     /**
@@ -47,7 +47,7 @@ class Custom extends BasicWePay
     public function get(array $options = [])
     {
         $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclarequery';
-        return $this->callPostApi($url, $options, false, 'MD5');
+        return $this->callPostApi($url, $options, false, 'MD5', true, false);
     }
 
 
@@ -61,7 +61,7 @@ class Custom extends BasicWePay
     public function reset(array $options = [])
     {
         $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/newcustoms/customdeclareredeclare';
-        return $this->callPostApi($url, $options, false, 'MD5');
+        return $this->callPostApi($url, $options, false, 'MD5', true, false);
     }
 
 }
\ No newline at end of file