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

application/library/Payment/TencentPay.php

@@ -123,6 +123,7 @@ class TencentPay {
         $this->parameters['nonce_str']=\Our\CommonExtension::createNoncestr(32);
         $this->postXml($this->orderquery_url);
         $this->result = $this->xmlToArray($this->response);
+        \Our\Log::getInstance()->write(json_encode($this->result),'/data/log/apptest');
         if($this->result['return_code']=="SUCCESS"&&$this->result['result_code']=="SUCCESS"&&$this->result['trade_state']=="SUCCESS"){
             return true;
         }

application/models/Business/Order/OrderService.php

@@ -1171,7 +1171,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn));
         $orderStateArray = array_column($orderList,'order_state');
 
-        \Our\Log::getInstance()->write(json_encode($data),'/data/log/apptest');
+        \Our\Log::getInstance()->write(json_encode($orderStateArray),'/data/log/apptest');
         if(in_array(\Our\ApiConst::orderStateWaitPay,$orderStateArray)&&in_array($oldOrderPay['pay_type'],array(\Our\ApiConst::wxAppPayType,\Our\ApiConst::wxLitePayType))&&((isset($data['payFlag'])&&$data['payFlag']==\Our\ApiConst::one)||!isset($data['payFlag']))){
             \Our\Log::getInstance()->write($data['payFlag'],'/data/log/apptest');
             if($oldOrderPay['pay_type']==\Our\ApiConst::wxLitePayType){
@@ -1185,7 +1185,13 @@ class OrderServiceModel extends \Business\AbstractModel
                 $payResult = $wxLitePay->getOrderPayResult($paySn,$subMchId);
             }else{
                 $wxPay = \Payment\WxPay::getInstance();
-                $payResult = $wxPay->getOrderPayResult($paySn);
+                $storeId = $orderList[0]['store_id'];
+                $mchIdArray = $storeDao->getStoreWxMchId($storeId);
+                if($mchIdArray['errorCode']>0){
+                    \Error\ErrorModel::throwException($mchIdArray['errorCode']);
+                }
+                $subMchId = $mchIdArray['mchId'];
+                $payResult = $wxPay->getOrderPayResult($paySn,$subMchId);
             }
             \Our\Log::getInstance()->write('支付结果'.$payResult,'/data/log/apptest');
             if($payResult){
@@ -1255,7 +1261,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $return['orderState'] = $orderState;
         if(isset($data['wxLitePayFlag'])&&$data['wxLitePayFlag']==\Our\ApiConst::one){
             $return['paySn'] = $data['paySn'];
-            if(!$orderState){
+            if(!$orderState&&!((isset($data['payFlag'])&&$data['payFlag']==\Our\ApiConst::one))){
                 $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
                 $paySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($data['paySn'],$memberId);
                 $return['paySn'] = $paySn;