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

application/library/Payment/Pay.php

@@ -45,11 +45,10 @@ class Pay {
             $orderInfo['openid'] = $authInfo['openid'];
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
-            $prepayId = $wxLitePay->getPrepayId();
-            file_put_contents(\Our\Common::getConfig('out.config') . \Our\PathConst::ktestTime, $prepayId.'|'
-                .$orderInfo['paySn'] );
+            $prepayId = $return['prepay_id'];
+            unset($return['prepay_id']);
+//            \Our\Log::getInstance()->write($prepayId,'/data/log/apptest');
             if($prepayId) {
-
                 $dbName = \Our\DbNameConst::masterDBConnectName;
                 \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$orderInfo['paySn']), array('prepay_id'=>$prepayId));
             }

application/library/Payment/TencentPay.php

@@ -104,7 +104,6 @@ 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;
     }

application/library/Payment/WxLitePay.php

@@ -35,9 +35,12 @@ class WxLitePay extends \Payment\TencentPay{
         }
         //$this->setRequestParams($orderInfo);
         $wxAppParameters = $this->getParameters();
+        $prepayId = $wxAppParameters['prepay_id'];
+        unset($wxAppParameters['prepay_id']);
         $returnData = array(
             'credential'=>array(\Our\NameConst::wxLiteChannel=>$wxAppParameters),
-            'app_id'=>$this->appid
+            'app_id'=>$this->appid,
+            'prepay_id'=>$prepayId
         );
         return $returnData;
     }
@@ -50,6 +53,8 @@ class WxLitePay extends \Payment\TencentPay{
         $wxApiObj['package'] = 'prepay_id='.$this->prepay_id;
         $wxApiObj['signType'] = 'MD5';
         $wxApiObj["paySign"] = $this->getSign($wxApiObj);
+        $wxApiObj["prepay_id"] = $this->prepay_id;
+
         return $wxApiObj;
     }