fe / 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 @@ -25,6 +25,7 @@ class PayData
25 { 25 {
26 $param = Yohobuy::param(); 26 $param = Yohobuy::param();
27 $param['client_type'] = 'web'; 27 $param['client_type'] = 'web';
  28 + $param['uid'] = intval($uid);
28 $param['private_key'] = Yohobuy::$privateKeyList['web']; 29 $param['private_key'] = Yohobuy::$privateKeyList['web'];
29 $param['method'] = 'web.SpaceOrders.getOrderCountByUid'; 30 $param['method'] = 'web.SpaceOrders.getOrderCountByUid';
30 31
@@ -5,7 +5,7 @@ use Shopping\PayModel; @@ -5,7 +5,7 @@ use Shopping\PayModel;
5 use WebPlugin\Pay\PayFactory; 5 use WebPlugin\Pay\PayFactory;
6 use WebPlugin\Pay\Rspparams; 6 use WebPlugin\Pay\Rspparams;
7 use WebPlugin\Pay\weixin\PayNotifyCallBack; 7 use WebPlugin\Pay\weixin\PayNotifyCallBack;
8 - 8 +use WebPlugin\UdpLog;
9 /** 9 /**
10 * 支付Notice 10 * 支付Notice
11 */ 11 */
@@ -24,6 +24,7 @@ class NoticeController extends WebAction @@ -24,6 +24,7 @@ class NoticeController extends WebAction
24 public function alipaynoticeAction() 24 public function alipaynoticeAction()
25 { 25 {
26 $res = $this->getParseResponse($_POST, 2); 26 $res = $this->getParseResponse($_POST, 2);
  27 + UdpLog::info("【支付宝异步】,function:alipaynoticeAction,参数", array('pars' => $_POST, 'res' => $res));
27 if ($res->payResult != -1) { 28 if ($res->payResult != -1) {
28 $this->payResultProc($res, 2); 29 $this->payResultProc($res, 2);
29 echo "success"; 30 echo "success";
@@ -37,6 +38,7 @@ class NoticeController extends WebAction @@ -37,6 +38,7 @@ class NoticeController extends WebAction
37 public function alipayreturnAction() 38 public function alipayreturnAction()
38 { 39 {
39 $res = $this->getParseResponse($_GET, 2); 40 $res = $this->getParseResponse($_GET, 2);
  41 + UdpLog::info("【支付宝同步】,function:alipayreturnAction,参数", array('pars' => $_GET, 'res' => $res));
40 $dealResult = $this->payResultProc($res, 2); 42 $dealResult = $this->payResultProc($res, 2);
41 $dealResult['payData'] = array('payWay' => '支付宝'); 43 $dealResult['payData'] = array('payWay' => '支付宝');
42 $this->commonShowResult($dealResult); 44 $this->commonShowResult($dealResult);
@@ -48,6 +50,7 @@ class NoticeController extends WebAction @@ -48,6 +50,7 @@ class NoticeController extends WebAction
48 public function alibarcodenoticeAction() 50 public function alibarcodenoticeAction()
49 { 51 {
50 $res = $this->getParseResponse($_POST, 17); 52 $res = $this->getParseResponse($_POST, 17);
  53 + UdpLog::info("【支付宝二维码支付异步】,function:alibarcodenoticeAction,参数", array('pars' => $_POST, 'res' => $res));
51 if ($res->payResult != -1) { 54 if ($res->payResult != -1) {
52 $this->payResultProc($res, 17); 55 $this->payResultProc($res, 17);
53 echo "success"; 56 echo "success";
@@ -61,6 +64,7 @@ class NoticeController extends WebAction @@ -61,6 +64,7 @@ class NoticeController extends WebAction
61 public function alibarcodereturnAction() 64 public function alibarcodereturnAction()
62 { 65 {
63 $res = $this->getParseResponse($_GET, 17); 66 $res = $this->getParseResponse($_GET, 17);
  67 + UdpLog::info("【支付宝二维码支付同步】,function:alibarcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
64 $dealResult = $this->payResultProc($res, 17); 68 $dealResult = $this->payResultProc($res, 17);
65 $dealResult['payData'] = array('payWay' => '支付宝'); 69 $dealResult['payData'] = array('payWay' => '支付宝');
66 $this->commonShowResult($dealResult); 70 $this->commonShowResult($dealResult);
@@ -225,6 +229,7 @@ class NoticeController extends WebAction @@ -225,6 +229,7 @@ class NoticeController extends WebAction
225 $uid = $this->getSession(self::SESSION_UID_KEY); 229 $uid = $this->getSession(self::SESSION_UID_KEY);
226 $this->setSession(self::SESSION_UID_KEY, null); 230 $this->setSession(self::SESSION_UID_KEY, null);
227 } 231 }
  232 + UdpLog::info("【微信扫码支付结果商户通知地址】,function:wechatqrcodenotifyAction");
228 $notify = new PayNotifyCallBack($uid); 233 $notify = new PayNotifyCallBack($uid);
229 $notify->handle(false); 234 $notify->handle(false);
230 } 235 }
@@ -248,6 +253,7 @@ class NoticeController extends WebAction @@ -248,6 +253,7 @@ class NoticeController extends WebAction
248 $payment = PayModel::getPaymentById(21); 253 $payment = PayModel::getPaymentById(21);
249 $payService = PayFactory::factory($payment); 254 $payService = PayFactory::factory($payment);
250 $res = $payService->parseResponse(array('orderCode' => $orderCode)); 255 $res = $payService->parseResponse(array('orderCode' => $orderCode));
  256 + UdpLog::info("【微信扫码支付返回】,function:wechatqrcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
251 $dealResult = $this->payResultProc($res, 21); 257 $dealResult = $this->payResultProc($res, 21);
252 $dealResult['payData'] = array('payWay' => '微信扫码支付'); 258 $dealResult['payData'] = array('payWay' => '微信扫码支付');
253 } while (false); 259 } while (false);