fe / YOHOBUYPC · Commits

Go to a project

Authored by cailing
Commit 889030e9bbe9295378f66923dbc032da7a1d7993 1 parent bf977b07

修改

Inline Side-by-side
Showing 2 changed files with 9 additions and 16 deletions
@@ -232,11 +232,10 @@ class OrderModel @@ -232,11 +232,10 @@ class OrderModel
232 $detail['operation'] = self::getOrderDetailOp($orderDetail['order_code'], $orderDetail['payment'], $orderDetail['status'], $orderDetail['is_cancel'], $orderDetail['payment_status'], $orderDetail['payment_type'], $orderDetail['order_type'], $orderDetail['attribute'], $orderDetail['refund_status']); //,$orderDetail['order_type_value'] 232 $detail['operation'] = self::getOrderDetailOp($orderDetail['order_code'], $orderDetail['payment'], $orderDetail['status'], $orderDetail['is_cancel'], $orderDetail['payment_status'], $orderDetail['payment_type'], $orderDetail['order_type'], $orderDetail['attribute'], $orderDetail['refund_status']); //,$orderDetail['order_type_value']
233 $detail['packages'] = CartModel::getPackageInfo($orderDetail); 233 $detail['packages'] = CartModel::getPackageInfo($orderDetail);
234 //判断是否可以修改地址 234 //判断是否可以修改地址
235 -// if($orderDetail['can_update_delivery_address'] == 'Y'){  
236 -// $detail['changeable'] = 'true';  
237 -// } 235 + if($orderDetail['can_update_delivery_address'] == 'Y'){
238 $detail['changeable'] = 'true'; 236 $detail['changeable'] = 'true';
239 } 237 }
  238 + }
240 return $detail; 239 return $detail;
241 } 240 }
242 241
@@ -245,22 +245,16 @@ class OrdersController extends WebAction @@ -245,22 +245,16 @@ class OrdersController extends WebAction
245 break; 245 break;
246 } 246 }
247 // 获取相关参数 247 // 获取相关参数
248 - $order_code = $this->get('orderCode', ''); //订单号  
249 - $user_name = $this->get('userName', ''); //收货人  
250 - $area_code = $this->get('areaCode', ''); //区号  
251 - $address = $this->get('address', ''); //地址  
252 - $mobile = $this->get('mobile', ''); //手机号码  
253 - $phoneNum = $this->get('phoneNum', ''); //固定电话  
254 - $phoneCode = $this->get('phoneCode', ''); //电话编号 248 + $order_code = $this->post('orderCode', ''); //订单号
  249 + $user_name = $this->post('userName', ''); //收货人
  250 + $area_code = $this->post('areaCode', ''); //区号
  251 + $address = $this->post('address', ''); //地址
  252 + $mobile = $this->post('mobile', ''); //手机号码
  253 + $phoneNum = $this->post('phoneNum', ''); //固定电话
  254 + $phoneCode = $this->post('phoneCode', ''); //电话编号
255 if(!empty($phoneNum)){ 255 if(!empty($phoneNum)){
256 $phone = $phoneCode.'-'.$phoneNum; 256 $phone = $phoneCode.'-'.$phoneNum;
257 } 257 }
258 -// $order_code = 1606640307; //订单号  
259 -// $user_name = '接口测试'; //收货人  
260 -// $area_code = 320102; //区号  
261 -// $address = '测试地址'; //地址  
262 -// $mobile = 18021408798; //手机号码  
263 -// $phone = 05128897456;  
264 if (!$order_code || !$user_name || !$area_code || !$address) { 258 if (!$order_code || !$user_name || !$area_code || !$address) {
265 $result = array('code' => 400, 'message' => '缺失必填项', 'data' => ''); 259 $result = array('code' => 400, 'message' => '缺失必填项', 'data' => '');
266 break; 260 break;