From 4b1112e8d4723ce5e6ef0d6eee41a02e588b60ab Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 3 May 2018 15:30:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=BB=9F=E4=B8=80=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/pay-order-create.php |  8 ++++++++
 WeChat/Pay.php            | 23 +++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Test/pay-order-create.php b/Test/pay-order-create.php
index 9d4b5e7..e130bb1 100644
--- a/Test/pay-order-create.php
+++ b/Test/pay-order-create.php
@@ -33,10 +33,18 @@ try {
         'notify_url'       => 'http://a.com/text.html',
         'spbill_create_ip' => '127.0.0.1',
     ];
+    // 生成预支付码
     $result = $wechat->createOrder($options);
+    // 创建JSAPI参数签名
+    $options = $wechat->createParamsForJsApi($result['prepay_id']);
 
+    echo '<pre>';
+    echo "\n--- 创建预支付码 ---\n";
     var_export($result);
 
+    echo "\n\n--- JSAPI 及 H5 参数 ---\n";
+    var_export($options);
+
 } catch (Exception $e) {
 
     // 出错啦，处理下吧
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index efb3203..5b4c6df 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -75,7 +75,7 @@ class Pay
     public function createOrder(array $options)
     {
         $url = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
-        return $this->callPostApi($url, $options);
+        return $this->callPostApi($url, $options, false, 'MD5');
     }
 
 
@@ -266,22 +266,23 @@ class Pay
 
     /**
      * 生成支付签名
-     * @param array $data
-     * @param string $signType
+     * @param array $data 参与签名的数据
+     * @param string $signType 参与签名的类型
+     * @param string $buff 参与签名字符串前缀
      * @return string
      */
-    public function getPaySign(array $data, $signType = 'MD5')
+    public function getPaySign(array $data, $signType = 'MD5', $buff = '')
     {
         unset($data['sign']);
         ksort($data);
-        list($key, $str) = [$this->config->get('mch_key'), ''];
         foreach ($data as $k => $v) {
-            $str .= "{$k}={$v}&";
+            $buff .= "{$k}={$v}&";
         }
-        if ($signType === 'MD5') {
-            return strtoupper(md5("{$str}key={$key}"));
+        $buff .= ("key=" . $this->config->get('mch_key'));
+        if (strtoupper($signType) === 'MD5') {
+            return strtoupper(md5($buff));
         }
-        return strtoupper(hash_hmac('SHA256', "{$str}key={$key}", $key));
+        return strtoupper(hash_hmac('SHA256', $buff, $this->config->get('mch_key')));
     }
 
     /**
@@ -307,9 +308,7 @@ class Pay
             $option['ssl_key'] = $this->config->get('ssl_key');
         }
         $params = $this->params->merge($data);
-        if ($needSignType) {
-            $params['sign_type'] = strtoupper($signType);
-        }
+        $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') {