orderClose

application/library/Payment/TencentPay.php

@@ -26,8 +26,8 @@ class TencentPay {
     protected $prepay_id ='';
     protected $tradeType = '';
     public  $data;//接收到的数据，类型为关联数组
-    var $returnParameters;//返回参数，类型为关联数组
-    var $parameters;//请求参数，类型为关联数组
+    public $returnParameters;//返回参数，类型为关联数组
+    public $parameters;//请求参数，类型为关联数组
 
     public function setRequestParams($orderInfo){
         $pay_sn = $orderInfo['paySn'];
@@ -158,8 +158,11 @@ class TencentPay {
     {
         if($signType=='MD5'){
             //echo '加签参数:'.json_encode($this->parameters)."\n";
-
-            $this->parameters["sign"] = $this->getSign($this->parameters);//签名
+            if(empty($this->parameters)){
+                echo 234234;exit;
+            }
+            $tempParam = $this->parameters;
+            $this->parameters["sign"] = $this->getSign($tempParam);//签名
         }else{
             $this->parameters["sign"] = $this->getHMACSHA1Sign($this->parameters,'sha256');
         }
@@ -281,9 +284,9 @@ class TencentPay {
      */
     public function getSign($Obj)
     {
-        if(empty($Obj)){
-            var_dump($this->parameters);exit;
-        }
+        /*if(empty($Obj)){
+            $Obj = $this->parameters;
+        }*/
         foreach ($Obj as $k => $v)
         {
             $Parameters[$k] = $v;

application/models/DAO/Order/RefundReturn.php

@@ -484,9 +484,10 @@ class RefundReturnModel extends \DAO\AbstractModel
             $param['subMchId'] = $mchIdArray['mchId'];
         }
         if (intval($orderInfo['paymentType']) == ApiConst::wxAppPayType) {
-            $wxpay = \Payment\WxPay::getInstance();
+            $wxpay = new \Payment\WxPay();
             //unset($param['subMchId']);
             $refund_return = $wxpay->refund($param);
+            unset($wxpay);
             $this->errorMessage = "微信返回:" . json_encode($refund_return);
             if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
                 if($refund_return['err_code_des']=='订单已全额退款' || $refund_return['err_code_des']=='订单已Q68额退款'){
@@ -497,8 +498,9 @@ class RefundReturnModel extends \DAO\AbstractModel
                 return false;
             }
         } else if (intval($orderInfo['paymentType']) == ApiConst::alipay) {
-            $aliPay = \Payment\Alipay::getInstance();
+            $aliPay = new \Payment\Alipay();
             $return = $aliPay->refund($param);
+            unset($aliPay);
             $this->errorMessage = "支付宝返回:" . json_encode($return);
             $resultCode = $return->code;
             if (!empty($resultCode) && $resultCode == ApiConst::alipayRefundSuccess) {
@@ -508,11 +510,10 @@ class RefundReturnModel extends \DAO\AbstractModel
                 return false;
             }
         } else if (intval($orderInfo['paymentType']) == ApiConst::wxProgram) {
-            $wxpay = \Payment\WxLitePay::getInstance();
+            $wxpay = new \Payment\WxLitePay();
             $refund_return = $wxpay->refund($param);
+            unset($wxpay);
             $this->errorMessage = "微信返回:" . json_encode($refund_return)."\r\n";
-            echo json_encode($param)."\r\n";
-            return false;
             if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
                 if($refund_return['err_code_des']=='订单已全额退款' || $refund_return['err_code_des']=='订单已Q68额退款'){
                     $this->errorMessage = date('Y-m-d') . $refund_return['err_code_des'] . $orderInfo['orderId'] . "\r\n";
@@ -522,6 +523,7 @@ class RefundReturnModel extends \DAO\AbstractModel
                 return false;
             }
         }
+
         return true;
     }