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

application/library/Payment/Pay.php

@@ -34,6 +34,9 @@ class Pay {
 			$alipay= Alipay::getInstance();
             $return = $alipay->doPay($orderInfo);
         }else if($data['channel'] == \Our\NameConst::wxLiteChannel){
+            $sess = \Yaf\Session::getInstance();
+            $authInfo = $sess->get('wxAuthInfo');
+            $orderInfo['openid'] = $authInfo['openid'];
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){

application/library/Payment/TencentPay.php

@@ -39,7 +39,9 @@ class TencentPay {
         }else{
             $this->parameters['total_fee'] = $total_fee;
         }
-
+        if(isset($orderInfo['openid'])&&$orderInfo['openid']){
+            $this->parameters['openid'] = $orderInfo['openid'];
+        }
         $this->parameters['spbill_create_ip']=\Our\Common::getClientIp();
         $this->parameters['notify_url']=$this->notify_url;
         $this->parameters['trade_type']= $this->tradeType;
@@ -66,7 +68,6 @@ class TencentPay {
     {
         $this->postXml();
         $this->result = $this->xmlToArray($this->response);
-        \Our\Log::getInstance()->write(json_encode($this->result));
         $prepay_id = isset($this->result["prepay_id"])?$this->result["prepay_id"]:\Our\ApiConst::zero;
         return $prepay_id;
     }