支付测试

application/library/Payment/TencentPay.php

@@ -108,19 +108,22 @@ class TencentPay {
         return $prepay_id;
     }
 
-    function getOrderPayResult($pay_sn,$serviceFlag=false){
-        if($serviceFlag){
-            $this->parameters['appid']=$this->appid;
-            $this->parameters['mch_id']=$this->mch_id;
-        }else{
+    function getOrderPayResult($pay_sn,$subMchId=false){
+        if($subMchId){
             $this->parameters['appid']=$this->s_appid;
             $this->parameters['mch_id']=$this->s_mch_id;
+            $this->parameters['sub_appid']=$this->appid;
+            $this->parameters['sub_mch_id']=$subMchId;
             $this->key = $this->s_key;
+        }else{
+            $this->parameters['appid']=$this->appid;
+            $this->parameters['mch_id']=$this->mch_id;
         }
         $this->parameters['out_trade_no']=$pay_sn;
         $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

@@ -1162,18 +1162,26 @@ class OrderServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::noOrderListForPaySn);
         }
 
+        $storeDao = \DAO\StoreModel::getInstance();
         $orderPayModel = \DAO\Order\OrderPayModel::getInstance();
         $paySn = $data['paySn'];
         $oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn));
         $orderStateArray = array_column($orderList,'order_state');
-        if(in_array(\Our\ApiConst::orderStateWaitPay,$orderStateArray)&&in_array($oldOrderPay['pay_type'],array(\Our\ApiConst::wxAppPayType,\Our\ApiConst::wxLitePayType))){
+        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)){
             if($oldOrderPay['pay_type']==\Our\ApiConst::wxLitePayType){
                 $wxLitePay = \Payment\WxLitePay::getInstance();
-                $payResult = $wxLitePay->getOrderPayResult($paySn,true);
+                $storeId = $orderList[0]['store_id'];
+                $mchIdArray = $storeDao->getStoreWxMchId($storeId);
+                if($mchIdArray['errorCode']>0){
+                    \Error\ErrorModel::throwException($mchIdArray['errorCode']);
+                }
+                $subMchId = $mchIdArray['mchId'];
+                $payResult = $wxLitePay->getOrderPayResult($paySn,$subMchId);
             }else{
                 $wxPay = \Payment\WxPay::getInstance();
                 $payResult = $wxPay->getOrderPayResult($paySn);
             }
+            \Our\Log::getInstance()->write('支付结果'.$payResult,'/data/log/apptest');
             if($payResult){
                 $orderConfirmUtil =  \Order\OrderConfirmUtil::getInstance();
                 $return = $orderConfirmUtil->updateOrderToPayed(array('paySn'=>$paySn,'pay_type'=>$oldOrderPay['pay_type']));
@@ -1189,7 +1197,6 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderTips = \Our\DescribeConst::paySuccessTips;
         $orderSubTips = \Our\DescribeConst::paySuccessSubTips;
         $orderContents = array();
-        $storeDao = \DAO\StoreModel::getInstance();
         $orderIds = array();
         $orderNos = array();
         $orderState = \Our\ApiConst::one;

application/models/Business/Order/PaymentService.php

@@ -40,6 +40,7 @@ class PaymentServiceModel extends \Business\AbstractModel{
         }else{
             $pay_type = \Our\ApiConst::wxAppPayType;
         }
+        var_dump($pay_type);
         $resultOrderPay = $orderPayModel->update(array('pay_type'=>$pay_type),array('pay_sn'=>$paySn));
         if(!$resultOrderPay){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::payTypeUpdateError);

conf/application.ini

@@ -404,7 +404,7 @@ elastic.master.scheme="http";
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
-resources.database.params.database = "qmcs"
+resources.database.params.database = "testqmcs"
 resources.database.params.username = "root"
 resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 resources.database.slave.params.driver   = "pdo_mysql"
 resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.database = "testqmcs"
 resources.database.slave.params.username = "root"
 resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"