Merge branch 'hotfix/addressId' into 'master'

地址ID重复加密问题修复



See merge request !10

@@ -446,8 +446,8 @@ class CartModel
             // 收货人有关信息
             $isSunfengSupport = false; // 是否支持顺丰快递
             if (isset($payReturn['delivery_address']) && !empty($payReturn['delivery_address'])) {
-                $result['addressId'] = isset($address['address_id']) ? $address['address_id'] : $payReturn['delivery_address']['address_id'];
-                $result['addressId'] = Encryption::encrypt($result['addressId']);
+                // $address 是浏览器端传来的，已经加密，  $payReturn 是后端接口的，未加密
+                $result['addressId'] = isset($address['address_id']) ? $address['address_id'] : Encryption::encrypt($payReturn['delivery_address']['address_id']);
                 $result['name'] = isset($address['consignee']) ? $address['consignee'] : $payReturn['delivery_address']['consignee'];
                 $result['phoneNum'] = isset($address['mobile']) ? $address['mobile'] : $payReturn['delivery_address']['mobile'];
 //                $result['area'] = isset($address['area']) ? $address['area'] : $payReturn['delivery_address']['area'];

@@ -612,6 +612,7 @@ class IndexController extends AbstractAction
         }
 
         $moreUrl = $this->getSession('addressMore');
+        $moreUrl = !empty($moreUrl) ? $moreUrl : '/cart/index/orderEnsure';
         $this->setNavHeader('选择地址', $moreUrl, false);
 
         $this->_view->display('select-address', array(