Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Payment/Pay.php

@@ -46,7 +46,8 @@ class Pay {
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
             $prepayId = $wxLitePay->getPrepayId();
-            file_put_contents($this->baseDir . \Our\PathConst::ktestTime, $prepayId.'|'.$orderInfo['paySn'] );
+            file_put_contents(\Our\Common::getConfig('out.config') . \Our\PathConst::ktestTime, $prepayId.'|'
+                .$orderInfo['paySn'] );
             if($prepayId) {
 
                 $dbName = \Our\DbNameConst::masterDBConnectName;

application/library/Payment/TencentPay.php

@@ -104,6 +104,7 @@ class TencentPay {
     {
         $this->postXml();
         $this->result = $this->xmlToArray($this->response);
+        \Our\Log::getInstance()->write(json_encode($this->result),'/data/log/apptest');
         $prepay_id = isset($this->result["prepay_id"])?$this->result["prepay_id"]:\Our\ApiConst::zero;
         return $prepay_id;
     }