for pub pay

data/api/open_wxpay/lib/OpenWxPay.Config.php

@@ -30,7 +30,7 @@ class OpenWxPayConfig
 
     const APPID = OPENWX_APPID;
     const MCHID = OPENWX_MCHID;
-    const KEY   = OPENWX_KEY;
+    const KEY   = WX_MCHKEY;
     const APPSECRET = OPENWX_APPSECRET;
 	
 	//=======【证书路径设置】=====================================
@@ -44,8 +44,8 @@ class OpenWxPayConfig
 //    const SSLCERT_PATH = '../cert/apiclient_cert.pem';
 //    const SSLKEY_PATH  = '../cert/apiclient_key.pem';
 
-    const SSLCERT_PATH = OPENWX_SSLCERT_PATH;
-    const SSLKEY_PATH  = OPENWX_SSLKEY_PATH;
+    const SSLCERT_PATH = WX_SSLCERT_PATH;
+    const SSLKEY_PATH  = WX_SSLKEY_PATH;
 
 	//=======【curl代理设置】===================================
 	/**

data/config/dev/pay.ini.php

@@ -14,18 +14,21 @@ define('MINIPAY_WXPAY_SSLCERT_PATH', '../cert/xyz_cert.pem');
 define('MINIPAY_WXPAY_SSLKEY_PATH',  '../cert/xyz_key.pem');
 
 define('OPENWX_APPID',       'wx24c5645aa986234a');
-define('OPENWX_MCHID',       '1279745801');
-define('OPENWX_KEY',         '0f86a4a9b1edb51b1a7d110fa223a157');
+
+define('WX_MCHID',       '1279745801');
+define('WX_MCHKEY',         '0f86a4a9b1edb51b1a7d110fa223a157');
 define('OPENWX_APPSECRET',   '41f93fef3207e917e742b9ebcd540cb2');
-define('OPENWX_SSLCERT_PATH', '../cert/panda_cert.pem');
-define('OPENWX_SSLKEY_PATH',  '../cert/panda_key.pem');
+define('WX_SSLCERT_PATH', '../cert/panda_cert.pem');
+define('WX_SSLKEY_PATH',  '../cert/panda_key.pem');
 
 
-define('SIGN_APPID',       'wx4139a76ccb1f74b3');
-define('SIGN_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
+//H5端，用户身份信息授权用的,数据来自 公众号->设置->基本配置
+//SIGN_APPID 和 AUTHOR_APPID是相同的.
+define('SIGN_APPID',       'wx38f1d15c5337e89b');
+define('SIGN_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 
-define('AUTHOR_APPID',       'wx4139a76ccb1f74b3');
-define('AUTHOR_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
+define('AUTHOR_APPID',       'wx38f1d15c5337e89b');
+define('AUTHOR_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 
 //for panda
 //define(ALIPAY_PATH, BASE_DATA_PATH . '/api/alipay');
@@ -40,11 +43,11 @@ define('AUTHOR_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
 //define(MINIPAY_WXPAY_SSLKEY_PATH,  '../cert/panda_key.pem');
 //
 //define(OPENWX_APPID,       'wx24c5645aa986234a');
-//define(OPENWX_MCHID,       '1279745801');
-//define(OPENWX_KEY,         '0f86a4a9b1edb51b1a7d110fa223a157');
+//define(WX_MCHID,       '1279745801');
+//define(WX_MCHKEY,         '0f86a4a9b1edb51b1a7d110fa223a157');
 //define(OPENWX_APPSECRET,   '41f93fef3207e917e742b9ebcd540cb2');
-//define(OPENWX_SSLCERT_PATH, '../cert/panda_cert.pem');
-//define(OPENWX_SSLKEY_PATH,  '../cert/panda_key.pem');
+//define(WX_SSLCERT_PATH, '../cert/panda_cert.pem');
+//define(WX_SSLKEY_PATH,  '../cert/panda_key.pem');
 //
 //define(SIGN_APPID,       'wx6b42e00ecaade538');
 //define(SIGN_APPSECRET,   'ee64233b3144d76217161666f8cb4c86');
@@ -65,11 +68,12 @@ define('AUTHOR_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
 //define(MINIPAY_WXPAY_SSLKEY_PATH,  '../cert/car_key.pem');
 //
 //define(OPENWX_APPID,       'wx73acdf06232c6a33');
-//define(OPENWX_MCHID,       '1498498152');
-//define(OPENWX_KEY,         '2b135842e47ae1935365d43a952cd5b6');
 //define(OPENWX_APPSECRET,   '92f261a220c79cf3711356ba91d1cb30');
-//define(OPENWX_SSLCERT_PATH, '../cert/car_cert.pem');
-//define(OPENWX_SSLKEY_PATH,  '../cert/car_key.pem');
+
+//define(WX_MCHID,       '1498498152');
+//define(WX_MCHKEY,         '2b135842e47ae1935365d43a952cd5b6');
+//define(WX_SSLCERT_PATH, '../cert/car_cert.pem');
+//define(WX_SSLKEY_PATH,  '../cert/car_key.pem');
 //
 //define(SIGN_APPID,       'wxaf698e1cc5f2073b');
 //define(SIGN_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');

data/config/prod/pay.ini.php

@@ -5,24 +5,29 @@ define('ALIPAY_PATH', BASE_DATA_PATH . '/api/alipay');
 define('ALIPAY_PARTNER', '2088121219613123');
 define('ALIPAY_SELLER_ID', 'napheir.ao@lrlz.com');
 
+//小程序支付参数。
 define('MINIPAY_WXPAY_APPID',       'wx4139a76ccb1f74b3');
 define('MINIPAY_WXPAY_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
 
+
 define('MINIPAY_WXPAY_MCHID',       '1600686690');
 define('MINIPAY_WXPAY_KEY',         '0f86a4a9b1edb51b1a8d180fa228a157');
 define('MINIPAY_WXPAY_SSLCERT_PATH', '../cert/xyz_cert.pem');
 define('MINIPAY_WXPAY_SSLKEY_PATH',  '../cert/xyz_key.pem');
 
 define('OPENWX_APPID',       'wx38f1d15c5337e89b');
-define('OPENWX_MCHID',       '1600686690');
-define('OPENWX_KEY',         '0f86a4a9b1edb51b1a7d110fa223a157');
 define('OPENWX_APPSECRET',   '0f62334f4196afa652d3b9d5864d88b4');
-define('OPENWX_SSLCERT_PATH', '../cert/xyz_cert.pem');
-define('OPENWX_SSLKEY_PATH',  '../cert/xyz_key.pem');
 
+
+define('WX_MCHID',       '1600686690');
+define('WX_MCHKEY',      '0f86a4a9b1edb51b1a7d110fa223a157');
+define('WX_SSLCERT_PATH', '../cert/xyz_cert.pem');
+define('WX_SSLKEY_PATH',  '../cert/xyz_key.pem');
+
+//H5端，用户身份信息授权用的,数据来自 公众号->设置->基本配置
+//SIGN_APPID 和 AUTHOR_APPID是相同的.
 define('SIGN_APPID',       'wx38f1d15c5337e89b');
 define('SIGN_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 
-//H5端，用户身份信息授权用的
 define('AUTHOR_APPID',       'wx38f1d15c5337e89b');
 define('AUTHOR_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');

data/config/test/pay.ini.php

@@ -14,11 +14,11 @@ define('MINIPAY_WXPAY_SSLCERT_PATH', '../cert/xyz_cert.pem');
 define('MINIPAY_WXPAY_SSLKEY_PATH',  '../cert/xyz_key.pem');
 
 define('OPENWX_APPID',       'wx24c5645aa986234a');
-define('OPENWX_MCHID',       '1279745801');
-define('OPENWX_KEY',         '0f86a4a9b1edb51b1a7d110fa223a157');
+define('WX_MCHID',       '1279745801');
+define('WX_MCHKEY',         '0f86a4a9b1edb51b1a7d110fa223a157');
 define('OPENWX_APPSECRET',   '41f93fef3207e917e742b9ebcd540cb2');
-define('OPENWX_SSLCERT_PATH', '../cert/panda_cert.pem');
-define('OPENWX_SSLKEY_PATH',  '../cert/panda_key.pem');
+define('WX_SSLCERT_PATH', '../cert/panda_cert.pem');
+define('WX_SSLKEY_PATH',  '../cert/panda_key.pem');
 
 define('SIGN_APPID',       'wx4139a76ccb1f74b3');
 define('SIGN_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');

helper/pay/jspay.php

@@ -22,6 +22,7 @@ use \WxPayApi;
 use \WxPayJsApiPay;
 use \WxPayException;
 use util;
+use Log;
 
 
 
@@ -39,6 +40,7 @@ class jspay implements IPay
 
     public function gen_pay($pay_sn,$fee,$order_sn,$subject)
     {
+        Log::record(__FUNCTION__,Log::DEBUG);
         $input = new WxPayUnifiedOrder();
         $input->SetBody($subject); //商品或支付单简要描述
         $input->SetAttach($pay_sn); //附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据

helper/pay_helper.php

@@ -136,7 +136,7 @@ class pay_helper
         if($payment == "wxpay") {
             $pay = new Pay\wxpay();
         }
-        else if($payment == "jspay")
+        elseif($payment == "jspay")
         {
             $openid = session_helper::pub_openid();
             Log::record("openid = {$openid}",Log::DEBUG);
@@ -148,12 +148,12 @@ class pay_helper
                 $pay = new Pay\jspay($openid);
             }
         }
-        else if($payment == "webpay")
+        elseif($payment == "webpay")
         {
             $openid = session_helper::pub_openid();
             $pay = new Pay\webpay($openid);
         }
-        else if($payment == "minipay")
+        elseif($payment == "minipay")
         {
             $openid = session_helper::pub_openid();
             Log::record("openid = {$openid}",Log::DEBUG);
@@ -165,7 +165,7 @@ class pay_helper
                 $pay = new Pay\minipay($openid);
             }
         }
-        else if($payment == "alipay")
+        elseif($payment == "alipay")
         {
             if(defined('SERVER_TYPE') && SERVER_TYPE == 'panda') {
                 $pay = new Pay\alipay();
@@ -177,7 +177,7 @@ class pay_helper
                 Log::record("没有找到阿里支付密钥",Log::DEBUG);
             }
         }
-        else if($payment == "cmbpay") {
+        elseif($payment == "cmbpay") {
             $pay = new Pay\cmbpay();
         }
         else {