yuncms / framework

src/payment/Trade.php

Spacing +7 added lines, -7 removed lines

@@ -16,11 +16,11 @@
 class Trade
 {
     //交易类型
-    const TYPE_NATIVE = 'NATIVE';//原生扫码支付
-    const TYPE_JS_API = 'JSAPI';//应用内JS API,如微信
-    const TYPE_APP = 'APP';//app支付
-    const TYPE_H5 = 'WAP';//H5支付
-    const TYPE_PC = 'PC';//PC支付
-    const TYPE_MICROPAY = 'MICROPAY';//刷卡支付
-    const TYPE_OFFLINE = 'OFFLINE';//离线（汇款、转账等）支付
+    const TYPE_NATIVE = 'NATIVE'; //原生扫码支付
+    const TYPE_JS_API = 'JSAPI'; //应用内JS API,如微信
+    const TYPE_APP = 'APP'; //app支付
+    const TYPE_H5 = 'WAP'; //H5支付
+    const TYPE_PC = 'PC'; //PC支付
+    const TYPE_MICROPAY = 'MICROPAY'; //刷卡支付
+    const TYPE_OFFLINE = 'OFFLINE'; //离线（汇款、转账等）支付
 }
\ No newline at end of file

src/payment/gateways/WeChat.php

Spacing +13 added lines, -13 removed lines

@@ -67,11 +67,11 @@ 
      * @var array 交易类型和Trade映射
      */
     public $tradeTypeMap = [
-        Gateway::TRADE_TYPE_NATIVE => 'NATIVE',//WEB 原生扫码支付
-        Gateway::TRADE_TYPE_JS_API => 'JSAPI',//应用内JS API,如微信
-        Gateway::TRADE_TYPE_APP => 'APP',//app支付
-        Gateway::TRADE_TYPE_H5 => 'MWEB',//H5支付
-        Gateway::TRADE_TYPE_MICROPAY => 'MICROPAY',//刷卡支付
+        Gateway::TRADE_TYPE_NATIVE => 'NATIVE', //WEB 原生扫码支付
+        Gateway::TRADE_TYPE_JS_API => 'JSAPI', //应用内JS API,如微信
+        Gateway::TRADE_TYPE_APP => 'APP', //app支付
+        Gateway::TRADE_TYPE_H5 => 'MWEB', //H5支付
+        Gateway::TRADE_TYPE_MICROPAY => 'MICROPAY', //刷卡支付
     ];
 
     /**
@@ -82,13 +82,13 @@ 
     {
         parent::init();
         if (empty ($this->appId)) {
-            throw new InvalidConfigException ('The "appId" property must be set.');
+            throw new InvalidConfigException('The "appId" property must be set.');
         }
         if (empty ($this->apiKey)) {
-            throw new InvalidConfigException ('The "apiKey" property must be set.');
+            throw new InvalidConfigException('The "apiKey" property must be set.');
         }
         if (empty ($this->mchId)) {
-            throw new InvalidConfigException ('The "mchId" property must be set.');
+            throw new InvalidConfigException('The "mchId" property must be set.');
         }
         $this->initPrivateKey();
         $this->initPublicKey();
@@ -115,7 +115,7 @@ 
                 throw new InvalidConfigException(openssl_error_string());
             }
         } else {
-            throw new InvalidConfigException ('The "privateKey" property must be set.');
+            throw new InvalidConfigException('The "privateKey" property must be set.');
         }
     }
 
@@ -132,7 +132,7 @@ 
                 throw new InvalidConfigException(openssl_error_string());
             }
         } else {
-            throw new InvalidConfigException ('The "publicKey" property must be set.');
+            throw new InvalidConfigException('The "publicKey" property must be set.');
         }
     }
 
@@ -157,7 +157,7 @@ 
         } elseif ($this->signType == self::SIGNATURE_METHOD_SHA256) {
             $sign = hash_hmac('sha256', $bizString, $this->apiKey);
         } else {
-            throw new InvalidConfigException ('This encryption is not supported');
+            throw new InvalidConfigException('This encryption is not supported');
         }
         return strtoupper($sign);
     }
@@ -198,7 +198,7 @@ 
                 $weParams = $trade->user->socialAccounts['wechat']->getDecodedData();
                 $data['openid'] = $weParams['openid'];
             } else {
-                throw new PaymentException ('Non-WeChat authorized login.');
+                throw new PaymentException('Non-WeChat authorized login.');
             }
         }
         $response = $this->post('pay/unifiedorder', $data)->send();
@@ -210,7 +210,7 @@ 
                 throw new PaymentException($response->data['return_msg']);
             }
         } else {
-            throw new Exception ('Http request failed.');
+            throw new Exception('Http request failed.');
         }
     }