Authored by 郭成尧

Merge branch 'hotfix/cartAdressSafe' into release/5.2

@@ -174,17 +174,19 @@ class OrderData @@ -174,17 +174,19 @@ class OrderData
174 174
175 /** 175 /**
176 * 订单详情页——地址修改 176 * 订单详情页——地址修改
177 - * @param type $order_code  
178 - * @param type $address_id  
179 - * @return type 177 + * @param $order_code
  178 + * @param $address_id
  179 + * @param $uid
  180 + * @return mixed
180 */ 181 */
181 - public static function updateDeliveryAddress($order_code, $address_id) 182 + public static function updateDeliveryAddress($order_code, $address_id, $uid)
182 { 183 {
183 // 构建必传参数 184 // 构建必传参数
184 $param = Yohobuy::param(); 185 $param = Yohobuy::param();
185 $param['method'] = 'app.SpaceOrders.updateDeliveryAddress'; 186 $param['method'] = 'app.SpaceOrders.updateDeliveryAddress';
186 $param['order_code'] = $order_code; 187 $param['order_code'] = $order_code;
187 $param['address_id'] = $address_id; 188 $param['address_id'] = $address_id;
  189 + $param['uid'] = $uid;
188 $param['client_secret'] = Sign::getSign($param); 190 $param['client_secret'] = Sign::getSign($param);
189 191
190 // 调用接口获得数据 192 // 调用接口获得数据
@@ -1194,7 +1194,7 @@ class HomeController extends AbstractAction @@ -1194,7 +1194,7 @@ class HomeController extends AbstractAction
1194 //address_id解密 1194 //address_id解密
1195 $address_id = urldecode($address_id); 1195 $address_id = urldecode($address_id);
1196 $address_id = Encryption::decrypt($address_id); 1196 $address_id = Encryption::decrypt($address_id);
1197 - $result = OrderData::updateDeliveryAddress($order_code, $address_id); 1197 + $result = OrderData::updateDeliveryAddress($order_code, $address_id, $this->getUid());
1198 if (!isset($result['code'])) { 1198 if (!isset($result['code'])) {
1199 break; 1199 break;
1200 } 1200 }