Authored by 郭成尧

Merge branch 'hotfix/cartAdressSafe' into release/5.2

... ... @@ -174,17 +174,19 @@ class OrderData
/**
* 订单详情页——地址修改
* @param type $order_code
* @param type $address_id
* @return type
* @param $order_code
* @param $address_id
* @param $uid
* @return mixed
*/
public static function updateDeliveryAddress($order_code, $address_id)
public static function updateDeliveryAddress($order_code, $address_id, $uid)
{
// 构建必传参数
$param = Yohobuy::param();
$param['method'] = 'app.SpaceOrders.updateDeliveryAddress';
$param['order_code'] = $order_code;
$param['address_id'] = $address_id;
$param['uid'] = $uid;
$param['client_secret'] = Sign::getSign($param);
// 调用接口获得数据
... ...
... ... @@ -1194,7 +1194,7 @@ class HomeController extends AbstractAction
//address_id解密
$address_id = urldecode($address_id);
$address_id = Encryption::decrypt($address_id);
$result = OrderData::updateDeliveryAddress($order_code, $address_id);
$result = OrderData::updateDeliveryAddress($order_code, $address_id, $this->getUid());
if (!isset($result['code'])) {
break;
}
... ...