Merge branch 'hotfix/payNotifyUrl'

@@ -27,12 +27,16 @@ class Yohobuy
     const SERVICE_URL = 'http://service.yoho.yohoops.org/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
     const API_OLD = 'http://api2.open.yohobuy.com/';
-
+//// 支付回调地址
+    const SERVICE_NOTIFY = 'http://service.yoho.cn/';
+    
     // 测试环境 */
 //     const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
 //     const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //     const API_OLD = 'http://test2.open.yohobuy.com/';
+////   支付回调地址
+//    const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
 
     /* 预览环境 */
 //     const API_URL = 'http://preapi.yoho.cn/';

@@ -49,7 +49,7 @@ class Service extends PayAbstract
             'service' => $this->config->service,
             'partner' => $this->config->partner,
             '_input_charset' => $this->config->input_charset,
-            'notify_url' => Yohobuy::SERVICE_URL . $this->config->notify_url,
+            'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url,
             'return_url' => Helpers::url($this->config->return_url),
             /* 业务参数 */
             'subject' => $params->goodsName,

@@ -53,7 +53,7 @@ class Service extends PayAbstract
             'service' => $this->config->service,
             'partner' => $this->config->partner,
             '_input_charset' => $this->config->input_charset,
-            'notify_url' => Yohobuy::SERVICE_URL . $this->config->notify_url,
+            'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url,
             'return_url' => Helpers::url($this->config->return_url),
             /* 业务参数 */
             'subject' => $params->goodsName,

@@ -49,7 +49,7 @@ class WxPayApi
         }
 
         //异步通知url
-        $inputObj->SetNotify_url(Yohobuy::SERVICE_URL . 'payment/weixin_notify'); //异步通知url
+        $inputObj->SetNotify_url(Yohobuy::SERVICE_NOTIFY . 'payment/weixin_notify'); //异步通知url
 
         $inputObj->SetAppid(WxPayConfig::APPID); //公众账号ID
         $inputObj->SetMch_id(WxPayConfig::MCHID); //商户号

@@ -523,6 +523,10 @@ class PaymentModel
 
             $reqParams = new Reqparams($orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'], $paymentParameter, $isTest, $uid, $userName);
             $reqPars = $payService->getPayRequestPars($reqParams);
+            UdpLog::info(
+                "【支付-参数】,function:getPayData,orderCode:{$orderCode},接口返回",
+                array('$reqPars' => $reqPars)
+            );
             if (empty($reqPars)) {
                 $result['error'] = true;
                 $result['message'] = '支付系统繁忙，请稍后再试';