diff --git a/FlyCube/Api/Controller/CheckController.class.php b/FlyCube/Api/Controller/CheckController.class.php index e5120c3..ce0b8b5 100644 --- a/FlyCube/Api/Controller/CheckController.class.php +++ b/FlyCube/Api/Controller/CheckController.class.php @@ -152,9 +152,9 @@ 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,back_status,back_remark,back_time,back_addtime,addtime'); + $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_status_remark,order_time,paid_time,refunded_time,completed_time,received_time,shipped_time,delivered_time,refundapply_time,rejected_time'); $where['openid'] = $this->openid; - $where['status'] = array('neq', 'canceled'); //排除已取消的订单 + $where['main_status'] = array('neq', '已取消'); //排除已取消的订单 $orderDb = D('order'); if ($orderList = $orderDb->where($where)->field($field)->select()) { echo json_encode(array('status' => 1, 'msg' => '访问成功', "orderList" => $orderList)); diff --git a/FlyCube/Api/Controller/PayController.class.php b/FlyCube/Api/Controller/PayController.class.php index 2a11e49..a540a82 100644 --- a/FlyCube/Api/Controller/PayController.class.php +++ b/FlyCube/Api/Controller/PayController.class.php @@ -68,8 +68,7 @@ class PayController extends PublicController exit(); } if ($order['openid'] != $this->openid || (float)$order['total_price'] < (float)$shop['price_min'] || $order['total_weight'] > $shop['weight_max']) { - $msg = array($order['openid'], $this->openid, (float)$order['total_price'], (float)$shop['price_min'], $order['total_weight'], $shop['weight_max']); - echo json_encode(array('status' => 0, 'msg' => $msg)); + echo json_encode(array('status' => 0, 'msg' => '提交信息异常')); exit(); }