From ba2a25629d7dadf68dad8b60ce9711ccefe8985a Mon Sep 17 00:00:00 2001 From: Tony Zou Date: Fri, 28 Sep 2018 23:50:47 +0800 Subject: [PATCH] fix: Final. --- app/Services/Gateway/TrimePay.php | 14 +++++++------- app/Services/Payment.php | 2 +- resources/views/material/user/trimepay.tpl | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/Services/Gateway/TrimePay.php b/app/Services/Gateway/TrimePay.php index ea659a5c..b3e3e1f5 100644 --- a/app/Services/Gateway/TrimePay.php +++ b/app/Services/Gateway/TrimePay.php @@ -122,17 +122,17 @@ class TrimePay extends AbstractPayment public function notify($request, $response, $args) { $data = array(); - $data['payStatus']=$_REQUEST['payStatus']; - $data['payFee']=$_REQUEST['payFee']; - $data['callbackTradeNo']=$_REQUEST['callbackTradeNo']; - $data['payType']=$_REQUEST['payType']; - $data['merchantTradeNo']=$_REQUEST['merchantTradeNo']; + $data['payStatus']=$request->getParam('payStatus'); + $data['payFee']=$request->getParam('payFee'); + $data['callbackTradeNo']=$request->getParam('callbackTradeNo'); + $data['payType']=$request->getParam('payType'); + $data['merchantTradeNo']=$request->getParam('merchantTradeNo'); - file_put_contents('/storage/trimepay_notify.log', json_encode($data)."\r\n", FILE_APPEND); + // file_put_contents('/storage/trimepay_notify.log', json_encode($data)."\r\n", FILE_APPEND); // 准备待签名数据 $str_to_sign = self::prepareSign($data); // 验证签名 - $resultVerify = self::verify($str_to_sign, $_REQUEST['sign']); + $resultVerify = self::verify($str_to_sign, $request->getParam('sign')); if ($resultVerify) { //file_put_contents('./trimepay_notify_success.log', json_encode($data)."\r\n", FILE_APPEND); self::postPayment($data['merchantTradeNo'], "TrimePay 支付宝"); diff --git a/app/Services/Payment.php b/app/Services/Payment.php index 219efea1..2d027fdb 100644 --- a/app/Services/Payment.php +++ b/app/Services/Payment.php @@ -45,7 +45,7 @@ class Payment } public static function notify($request, $response, $args){ - return self::getClient()->notify($request, $response, $args); + self::getClient()->notify($request, $response, $args); } public static function returnHTML($request, $response, $args){ diff --git a/resources/views/material/user/trimepay.tpl b/resources/views/material/user/trimepay.tpl index b15bd725..fa55c114 100644 --- a/resources/views/material/user/trimepay.tpl +++ b/resources/views/material/user/trimepay.tpl @@ -1,6 +1,5 @@

TrimePay 支付宝充值

- 您的余额:{$user->money}