wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 1600d6060d52ebbca958b9eee154eed4cc973227 2 parents 97a3670e 5c154d00

Merge branch 'hotfix/getOrderCountByUid' into hotfix/searchShop

Inline Side-by-side
Showing 2 changed files with 8 additions and 1 deletions
... ... @@ -25,6 +25,7 @@ class PayData
{
$param = Yohobuy::param();
$param['client_type'] = 'web';
$param['uid'] = intval($uid);
$param['private_key'] = Yohobuy::$privateKeyList['web'];
$param['method'] = 'web.SpaceOrders.getOrderCountByUid';
... ...
... ... @@ -5,7 +5,7 @@ use Shopping\PayModel;
use WebPlugin\Pay\PayFactory;
use WebPlugin\Pay\Rspparams;
use WebPlugin\Pay\weixin\PayNotifyCallBack;
use WebPlugin\UdpLog;
/**
* 支付Notice
*/
... ... @@ -24,6 +24,7 @@ class NoticeController extends WebAction
public function alipaynoticeAction()
{
$res = $this->getParseResponse($_POST, 2);
UdpLog::info("【支付宝异步】,function:alipaynoticeAction,参数", array('pars' => $_POST, 'res' => $res));
if ($res->payResult != -1) {
$this->payResultProc($res, 2);
echo "success";
... ... @@ -37,6 +38,7 @@ class NoticeController extends WebAction
public function alipayreturnAction()
{
$res = $this->getParseResponse($_GET, 2);
UdpLog::info("【支付宝同步】,function:alipayreturnAction,参数", array('pars' => $_GET, 'res' => $res));
$dealResult = $this->payResultProc($res, 2);
$dealResult['payData'] = array('payWay' => '支付宝');
$this->commonShowResult($dealResult);
... ... @@ -48,6 +50,7 @@ class NoticeController extends WebAction
public function alibarcodenoticeAction()
{
$res = $this->getParseResponse($_POST, 17);
UdpLog::info("【支付宝二维码支付异步】,function:alibarcodenoticeAction,参数", array('pars' => $_POST, 'res' => $res));
if ($res->payResult != -1) {
$this->payResultProc($res, 17);
echo "success";
... ... @@ -61,6 +64,7 @@ class NoticeController extends WebAction
public function alibarcodereturnAction()
{
$res = $this->getParseResponse($_GET, 17);
UdpLog::info("【支付宝二维码支付同步】,function:alibarcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
$dealResult = $this->payResultProc($res, 17);
$dealResult['payData'] = array('payWay' => '支付宝');
$this->commonShowResult($dealResult);
... ... @@ -225,6 +229,7 @@ class NoticeController extends WebAction
$uid = $this->getSession(self::SESSION_UID_KEY);
$this->setSession(self::SESSION_UID_KEY, null);
}
UdpLog::info("【微信扫码支付结果商户通知地址】,function:wechatqrcodenotifyAction");
$notify = new PayNotifyCallBack($uid);
$notify->handle(false);
}
... ... @@ -248,6 +253,7 @@ class NoticeController extends WebAction
$payment = PayModel::getPaymentById(21);
$payService = PayFactory::factory($payment);
$res = $payService->parseResponse(array('orderCode' => $orderCode));
UdpLog::info("【微信扫码支付返回】,function:wechatqrcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
$dealResult = $this->payResultProc($res, 21);
$dealResult['payData'] = array('payWay' => '微信扫码支付');
} while (false);
... ...