Browse Source

add to local

stanley-king 9 years ago
parent
commit
01db68a4d3
3 changed files with 9 additions and 3 deletions
  1. 2 2
      data/config/config.ini.php
  2. 5 1
      mobile/control/app_pay.php
  3. 2 0
      run.php

+ 2 - 2
data/config/config.ini.php

@@ -14,7 +14,7 @@ const boss_host    = 'http://172.40.2.14';
 const jeff_office = 'http://192.168.1.128';
 const jeff_office = 'http://192.168.1.128';
 const liax_office = 'http://192.168.1.136';
 const liax_office = 'http://192.168.1.136';
 
 
-$SRV_HOST = test_srv_host;
+$SRV_HOST = DY_HOST;
 $REMOTE_IMG_HOST = 'http://p.lrlz.com';
 $REMOTE_IMG_HOST = 'http://p.lrlz.com';
 
 
 $config['base_site_url']        = $SRV_HOST;
 $config['base_site_url']        = $SRV_HOST;
@@ -47,7 +47,7 @@ $config['db']['1']['dbhost']       = '127.0.0.1';
 $config['db']['1']['dbport']       = '3306';
 $config['db']['1']['dbport']       = '3306';
 $config['db']['1']['dbuser']       = 'root';
 $config['db']['1']['dbuser']       = 'root';
 $config['db']['1']['dbpwd']        = '55668899';
 $config['db']['1']['dbpwd']        = '55668899';
-$config['db']['1']['dbname']       = 'shop0129';
+$config['db']['1']['dbname']       = 'shopnc';
 $config['db']['1']['dbcharset']    = 'UTF-8';
 $config['db']['1']['dbcharset']    = 'UTF-8';
 $config['db']['slave']                  = $config['db']['master'];
 $config['db']['slave']                  = $config['db']['master'];
 $config['session_expire'] 	= 3600;
 $config['session_expire'] 	= 3600;

+ 5 - 1
mobile/control/app_pay.php

@@ -32,6 +32,7 @@ class app_payControl extends mbMemberControl
     {
     {
         $token = trim($_GET['key']);
         $token = trim($_GET['key']);
         if (false == $this->checkToken($token)) {
         if (false == $this->checkToken($token)) {
+            Log::record("uniorder 1",Log::ERR);
             return joutput_error($this->err_code);
             return joutput_error($this->err_code);
         }
         }
 
 
@@ -39,6 +40,7 @@ class app_payControl extends mbMemberControl
         $payment = $_GET['payment'];
         $payment = $_GET['payment'];
 
 
         if (in_array($payment, self::$pay_types) == false) {
         if (in_array($payment, self::$pay_types) == false) {
+            Log::record("uniorder 2",Log::ERR);
             return joutput_error(errcode::ErrPayment, "err paytype {$payment}: only for wxpay,alipay");
             return joutput_error(errcode::ErrPayment, "err paytype {$payment}: only for wxpay,alipay");
         }
         }
 
 
@@ -52,6 +54,7 @@ class app_payControl extends mbMemberControl
         //重新计算所需支付金额
         //重新计算所需支付金额
         $result = $logic_payment->getRealOrderInfo($pay_sn, $this->member_info['member_id']);
         $result = $logic_payment->getRealOrderInfo($pay_sn, $this->member_info['member_id']);
         if (intval($result['data']['api_pay_state']) != 0) {
         if (intval($result['data']['api_pay_state']) != 0) {
+            Log::record("uniorder 3",Log::ERR);
             return joutput_error(errcode::ErrPayment, $result['msg']);
             return joutput_error(errcode::ErrPayment, $result['msg']);
         }
         }
 
 
@@ -65,6 +68,7 @@ class app_payControl extends mbMemberControl
             if ($ret != false) {
             if ($ret != false) {
                 $output['pay_info'] = $ret;
                 $output['pay_info'] = $ret;
             } else {
             } else {
+                Log::record("uniorder 4",Log::ERR);
                 return joutput_error(errcode::ErrPayment, '支付失败.');
                 return joutput_error(errcode::ErrPayment, '支付失败.');
             }
             }
         } else {
         } else {
@@ -78,7 +82,7 @@ class app_payControl extends mbMemberControl
                 $ret = $logic_delivery->putOrder($pay_sn, $this->member_info['member_id']);
                 $ret = $logic_delivery->putOrder($pay_sn, $this->member_info['member_id']);
 
 
                 if(empty($ret)) {
                 if(empty($ret)) {
-                    Log::record("Put order to oms error: pay_sn={$pay_sn},bonus pay.");
+                    Log::record("Put order to oms error: pay_sn={$pay_sn},bonus pay.",Log::ERR);
                 }
                 }
             }
             }
         }
         }

+ 2 - 0
run.php

@@ -21,6 +21,8 @@ function help_out()
 
 
 $y = strtotime('2016-12-12 01:01:01');
 $y = strtotime('2016-12-12 01:01:01');
 
 
+$y = urldecode('%E4%B8%AD%E9%80%9A%E5%BF%AB%E9%80%92');
+
 $x=new date();
 $x=new date();
 
 
 define('StartTime', microtime(true));
 define('StartTime', microtime(true));