diff --git a/FlyCube/Api/Controller/CheckController.class.php b/FlyCube/Api/Controller/CheckController.class.php index e51b382..3365a8f 100644 --- a/FlyCube/Api/Controller/CheckController.class.php +++ b/FlyCube/Api/Controller/CheckController.class.php @@ -148,7 +148,7 @@ class CheckController extends PublicController $whereSite['shop_id'] = $_REQUEST['shop_id']; $site = $siteDb->where($whereSite)->find(); if (!$site) { - echo json_encode(array('status' => 0, 'msg' => '收货地址不合法')); + echo json_encode(array('status' => 0, 'msg' => '收货地址错误')); exit(); //没有收货地址 有问题跳出 } $data['receive_site_id'] = $_REQUEST['site_id']; @@ -171,7 +171,7 @@ class CheckController extends PublicController */ public function getOrderList() { - $field = array('order_sn,food_sn,total_weight,total_num,total_price,refund_price,receiver,tel,receive_site_id,receive_site_name,remark,product_snapshot,main_status,shipment_status,refund_status,refund_remark,order_time,paid_time,refunded_time,completed_time,received_time,shipped_time,delivered_time,refundapply_time,rejected_time'); + $field = array('order_sn,food_sn,total_weight,total_num,total_price,transport_price,pack_price,refund_price,receiver,tel,receive_site_id,receive_site_name,remark,product_snapshot,main_status,shipment_status,refund_status,refund_remark,order_time,paid_time,refunded_time,completed_time,received_time,shipped_time,delivered_time,refundapply_time,rejected_time'); $where['openid'] = $this->openid; $where['main_status'] = array('neq', '已取消'); //排除已取消的订单 $orderDb = D('order');