stanley-king 8 лет назад
Родитель
Сommit
5b1b17883e
2 измененных файлов с 9 добавлено и 2 удалено
  1. 6 1
      helper/pay/cmbpay.php
  2. 3 1
      mobile/wxnotify.php

+ 6 - 1
helper/pay/cmbpay.php

@@ -63,7 +63,12 @@ class NotifyData
 
     private function public_key()
     {
-        $pub_key = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALuUIwMGhvbpCwYzKCMzvSMQiLAAj5y74cN09N1TXVONPWhvLWkuzEPSd1ogPJLWiVyEG7gEIBT3zTlCV+NMou0CAwEAAQ==';
+        if(CMPPAY_ONLINE == true) {
+            $pub_key = 'MIGJAoGBALKsktbh7j9O9pM0p7qnxxImgODqxjpiT7Xl2bvZCywJtwsNI6CchqAagOYGJjG0NZsnjFunTw5YM9TD5KxsUOILAL6IaNMH/fWREhVjkUDJ4CYtLWlKozElvXRp1iZxf66yHHhN4t7TE5S9NWpEBSn37TEfFLU99Go1WReI1XN1AgMBAAE=';
+        } else {
+            $pub_key = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALuUIwMGhvbpCwYzKCMzvSMQiLAAj5y74cN09N1TXVONPWhvLWkuzEPSd1ogPJLWiVyEG7gEIBT3zTlCV+NMou0CAwEAAQ==';
+        }
+
         $pk = chunk_split($pub_key, 64, "\n");
         $pk = "-----BEGIN PUBLIC KEY-----\n{$pk}-----END PUBLIC KEY-----\n";
         return $pk;

+ 3 - 1
mobile/wxnotify.php

@@ -17,6 +17,8 @@ require_once (WXPAY_PATH . '/lib/WxPay.Data.php');
 require_once (WXPAY_PATH . '/lib/WxPay.Exception.php');
 require_once (WXPAY_PATH . '/lib/WxPay.Notify.php');
 require_once (BASE_DATA_PATH . '/logic/delivery.logic.php');
+require_once(BASE_ROOT_PATH . '/helper/pay_helper.php');
+
 
 //xml格式
 //$content = '<xml><appid><![CDATA[wx24c5645aa986234a]]></appid>
@@ -55,7 +57,7 @@ try
         $trade_no = $result['transaction_id'];
 
         Log::record("out_trade_no={$out_trade_no} and pay_sn={$pay_sn} and trade_no = {$trade_no}",Log::DEBUG);
-        $cb_info = app_payControl::update_order($pay_sn,$trade_no,'wxpay');
+        $cb_info = pay_helper::update_order($pay_sn,$trade_no,'wxpay');
         if($cb_info['state'] == false) {
             Log::record('wxpay error.',Log::DEBUG);
         }