code review by fei.hong : modify alipay and weixin pay notice url

@@ -372,6 +372,16 @@ server
         proxy_set_header   Accept-Encoding "gzip";
         proxy_set_header   Accept-Encoding "gzip";
     }
     }
 
 
+    ## since 2016/01/23
+    location ^~ /shopping/pay/alipay {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
     location / {
     location / {
         proxy_redirect off;
         proxy_redirect off;
         proxy_pass http://119.254.81.245;
         proxy_pass http://119.254.81.245;

@@ -828,7 +828,7 @@ class HomeController extends AbstractAction
             'payAppInfo' => array(
             'payAppInfo' => array(
                 0 => array(
                 0 => array(
                     'appIcon' => '',
                     'appIcon' => '',
-                    'payLink' => Helpers::url('/shopping/pay/index', array('order_code' => $orderCode, 'payment_type' => 18)),
+                    'payLink' => Helpers::url('/shopping/pay/alipay', array('order_code' => $orderCode, 'payment_type' => 18)),
                     'appId' => 'alipay',
                     'appId' => 'alipay',
                     'app' => '支付宝支付',
                     'app' => '支付宝支付',
                     'hint' => '支付宝钱包支付',
                     'hint' => '支付宝钱包支付',

@@ -38,6 +38,7 @@ class PayController extends AbstractAction
             /* 判断用户是否登录 */
             /* 判断用户是否登录 */
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             if (!$uid) {
             if (!$uid) {
+                $this->go( Helpers::url('/signin.html', array('refer' => $this->_request->server('HTTP_REFERER'))) );
                 break;
                 break;
             }
             }
             
             
@@ -67,13 +68,13 @@ class PayController extends AbstractAction
             // 此处是咨询过JAVA开发任明明，按照老代码的实现方式判断，更新支付方式
             // 此处是咨询过JAVA开发任明明，按照老代码的实现方式判断，更新支付方式
             $paymentRecod = OrderData::updateOrderPayment($orderCode, 2, $uid);
             $paymentRecod = OrderData::updateOrderPayment($orderCode, 2, $uid);
             if (empty($paymentRecod) || $paymentRecod['code'] != 200) {
             if (empty($paymentRecod) || $paymentRecod['code'] != 200) {
+                $this->helpJsRedirect('系统繁忙，请稍后再试');
                 break;
                 break;
             }
             }
             
             
             $this->go($payRequestPars['pay_url'] . $payRequestPars['pars']);
             $this->go($payRequestPars['pay_url'] . $payRequestPars['pars']);
         }
         }
         while (false);
         while (false);
-        echo 'dd';
     }
     }
     
     
     /**
     /**