Authored by cailing

修改

@@ -174,13 +174,12 @@ class OrderData @@ -174,13 +174,12 @@ class OrderData
174 * @param type $address_id 174 * @param type $address_id
175 * @return type 175 * @return type
176 */ 176 */
177 - public static function updateDeliveryAddress($order_code, $address_id, $user_name, $area_code, $address, $mobile, $phone) 177 + public static function updateDeliveryAddress($order_code, $user_name, $area_code, $address, $mobile, $phone)
178 { 178 {
179 // 构建必传参数 179 // 构建必传参数
180 $param = Yohobuy::param(); 180 $param = Yohobuy::param();
181 $param['method'] = 'app.SpaceOrders.updateDeliveryAddress'; 181 $param['method'] = 'app.SpaceOrders.updateDeliveryAddress';
182 $param['order_code'] = $order_code; 182 $param['order_code'] = $order_code;
183 - $param['address_id'] = $address_id;  
184 $param['user_name'] = $user_name; 183 $param['user_name'] = $user_name;
185 $param['area_code'] = $area_code; 184 $param['area_code'] = $area_code;
186 $param['address'] = $address; 185 $param['address'] = $address;
@@ -233,24 +233,6 @@ class OrdersController extends WebAction @@ -233,24 +233,6 @@ class OrdersController extends WebAction
233 } 233 }
234 234
235 /** 235 /**
236 - * 获取省市区县信息列表  
237 - *  
238 - * @param int id  
239 - * @return json  
240 - */  
241 -// public function getAreaListAction()  
242 -// {  
243 -// $result = array('code' => 200, 'message' => '地区信息', 'data' => array());  
244 -//  
245 -// if ($this->isAjax()) {  
246 -// $id = $this->get('id', 0);  
247 -// $result['data'] = CartModel::getAreaList($id);  
248 -// }  
249 -//  
250 -// $this->echoJson($result);  
251 -// }  
252 -  
253 - /**  
254 * 订单详情页地址修改 236 * 订单详情页地址修改
255 */ 237 */
256 public function modifyAddressAction() 238 public function modifyAddressAction()
@@ -270,19 +252,20 @@ class OrdersController extends WebAction @@ -270,19 +252,20 @@ class OrdersController extends WebAction
270 $mobile = $this->get('mobile', ''); //手机号码 252 $mobile = $this->get('mobile', ''); //手机号码
271 $phoneNum = $this->get('phoneNum', ''); //固定电话 253 $phoneNum = $this->get('phoneNum', ''); //固定电话
272 $phoneCode = $this->get('phoneCode', ''); //电话编号 254 $phoneCode = $this->get('phoneCode', ''); //电话编号
273 - if(!empty($phoneNum) && !empty($phoneCode)){ 255 + if(!empty($phoneNum)){
274 $phone = $phoneCode.'-'.$phoneNum; 256 $phone = $phoneCode.'-'.$phoneNum;
275 } 257 }
276 -// $order_code = 1616956289; //订单号 258 +// $order_code = 1606640307; //订单号
277 // $user_name = '接口测试'; //收货人 259 // $user_name = '接口测试'; //收货人
278 -// $area_code = 321023; //区号 260 +// $area_code = 320102; //区号
279 // $address = '测试地址'; //地址 261 // $address = '测试地址'; //地址
280 // $mobile = 18021408798; //手机号码 262 // $mobile = 18021408798; //手机号码
  263 +// $phone = 05128897456;
281 if (!$order_code || !$user_name || !$area_code || !$address) { 264 if (!$order_code || !$user_name || !$area_code || !$address) {
282 $result = array('code' => 400, 'message' => '缺失必填项', 'data' => ''); 265 $result = array('code' => 400, 'message' => '缺失必填项', 'data' => '');
283 break; 266 break;
284 } 267 }
285 - $result = OrderData::updateDeliveryAddress($order_code, $address_id, $user_name, $area_code, $address, $mobile, $phone); 268 + $result = OrderData::updateDeliveryAddress($order_code, $user_name, $area_code, $address, $mobile, $phone);
286 if (!isset($result['code'])) { 269 if (!isset($result['code'])) {
287 break; 270 break;
288 } 271 }