fe / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 5d318b5237f19f9dbd3c04d05c3431c4a150e973 2 parents efbbb8b0 01d7324b

Merge branch 'hotfix/payNotifyUrl'

Inline Side-by-side
Showing 5 changed files with 12 additions and 4 deletions
@@ -27,12 +27,16 @@ class Yohobuy @@ -27,12 +27,16 @@ class Yohobuy
27 const SERVICE_URL = 'http://service.yoho.yohoops.org/'; 27 const SERVICE_URL = 'http://service.yoho.yohoops.org/';
28 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 28 const YOHOBUY_URL = 'http://www.yohobuy.com/';
29 const API_OLD = 'http://api2.open.yohobuy.com/'; 29 const API_OLD = 'http://api2.open.yohobuy.com/';
30 - 30 +//// 支付回调地址
  31 + const SERVICE_NOTIFY = 'http://service.yoho.cn/';
  32 +
31 // 测试环境 */ 33 // 测试环境 */
32 // const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/' 34 // const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
33 // const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; 35 // const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
34 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 36 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
35 // const API_OLD = 'http://test2.open.yohobuy.com/'; 37 // const API_OLD = 'http://test2.open.yohobuy.com/';
  38 +//// 支付回调地址
  39 +// const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
36 40
37 /* 预览环境 */ 41 /* 预览环境 */
38 // const API_URL = 'http://preapi.yoho.cn/'; 42 // const API_URL = 'http://preapi.yoho.cn/';
@@ -49,7 +49,7 @@ class Service extends PayAbstract @@ -49,7 +49,7 @@ class Service extends PayAbstract
49 'service' => $this->config->service, 49 'service' => $this->config->service,
50 'partner' => $this->config->partner, 50 'partner' => $this->config->partner,
51 '_input_charset' => $this->config->input_charset, 51 '_input_charset' => $this->config->input_charset,
52 - 'notify_url' => Yohobuy::SERVICE_URL . $this->config->notify_url, 52 + 'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url,
53 'return_url' => Helpers::url($this->config->return_url), 53 'return_url' => Helpers::url($this->config->return_url),
54 /* 业务参数 */ 54 /* 业务参数 */
55 'subject' => $params->goodsName, 55 'subject' => $params->goodsName,
@@ -53,7 +53,7 @@ class Service extends PayAbstract @@ -53,7 +53,7 @@ class Service extends PayAbstract
53 'service' => $this->config->service, 53 'service' => $this->config->service,
54 'partner' => $this->config->partner, 54 'partner' => $this->config->partner,
55 '_input_charset' => $this->config->input_charset, 55 '_input_charset' => $this->config->input_charset,
56 - 'notify_url' => Yohobuy::SERVICE_URL . $this->config->notify_url, 56 + 'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url,
57 'return_url' => Helpers::url($this->config->return_url), 57 'return_url' => Helpers::url($this->config->return_url),
58 /* 业务参数 */ 58 /* 业务参数 */
59 'subject' => $params->goodsName, 59 'subject' => $params->goodsName,
@@ -49,7 +49,7 @@ class WxPayApi @@ -49,7 +49,7 @@ class WxPayApi
49 } 49 }
50 50
51 //异步通知url 51 //异步通知url
52 - $inputObj->SetNotify_url(Yohobuy::SERVICE_URL . 'payment/weixin_notify'); //异步通知url 52 + $inputObj->SetNotify_url(Yohobuy::SERVICE_NOTIFY . 'payment/weixin_notify'); //异步通知url
53 53
54 $inputObj->SetAppid(WxPayConfig::APPID); //公众账号ID 54 $inputObj->SetAppid(WxPayConfig::APPID); //公众账号ID
55 $inputObj->SetMch_id(WxPayConfig::MCHID); //商户号 55 $inputObj->SetMch_id(WxPayConfig::MCHID); //商户号
@@ -523,6 +523,10 @@ class PaymentModel @@ -523,6 +523,10 @@ class PaymentModel
523 523
524 $reqParams = new Reqparams($orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'], $paymentParameter, $isTest, $uid, $userName); 524 $reqParams = new Reqparams($orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'], $paymentParameter, $isTest, $uid, $userName);
525 $reqPars = $payService->getPayRequestPars($reqParams); 525 $reqPars = $payService->getPayRequestPars($reqParams);
  526 + UdpLog::info(
  527 + "【支付-参数】,function:getPayData,orderCode:{$orderCode},接口返回",
  528 + array('$reqPars' => $reqPars)
  529 + );
526 if (empty($reqPars)) { 530 if (empty($reqPars)) {
527 $result['error'] = true; 531 $result['error'] = true;
528 $result['message'] = '支付系统繁忙，请稍后再试'; 532 $result['message'] = '支付系统繁忙，请稍后再试';