diff --git a/FlyCube/MpApi/Controller/AdminController.class.php b/FlyCube/MpApi/Controller/AdminController.class.php index 15a1281..54bad9c 100644 --- a/FlyCube/MpApi/Controller/AdminController.class.php +++ b/FlyCube/MpApi/Controller/AdminController.class.php @@ -710,7 +710,7 @@ class AdminController extends PublicController } } /** - * @description: 获取订单列表(只拿已付款 未送达) 链表查询还有关联的站点列表的 bind_route runing字段一并取出 + * @description: 获取订单列表(只拿已付款) 链表查询还有关联的站点列表的 bind_route runing字段一并取出 */ public function getPaidOrderList() { @@ -719,21 +719,16 @@ class AdminController extends PublicController } $orderDb = D('order'); - $where = []; - if ($this->tokenShop_id != C('powerId')) { - $where['o.shop_id'] = $this->tokenShop_id; - } $where['o.main_status'] = '已付款'; - $where['o.shipment_status'] = array('NEQ', '已送达'); $paidOrderList = $orderDb ->alias('o') // 别名为 o ->join('lr_receive_site rs ON o.receive_site_id = rs.id') // 关联 lr_receive_site 表 - ->field('o.id,o.shop_id,o.order_sn,o.food_sn,o.total_weight,o.total_num,o.total_price,o.apply_price,o.receiver,o.tel,o.receive_site_id,o.receive_site_name,o.remark,o.product_snapshot,o.main_status,o.shipment_status,o.refund_status,o.refund_remark,o.order_time,o.refundapply_time, rs.bind_route, rs.runing') // 选择字段,包括 bind_route 和 runing + ->field('o.id,o.shop_id,o.order_sn,o.food_sn,o.total_weight,o.total_num,o.total_price,o.apply_price,o.receiver,o.tel,o.by_plane_id,o.receive_site_id,o.receive_site_name,o.remark,o.product_snapshot,o.main_status,o.shipment_status,o.refund_status,o.refund_remark,o.order_time,o.refundapply_time, rs.bind_route, rs.runing') // 选择字段,包括 bind_route 和 runing ->where($where) ->select(); if ($paidOrderList) { - echo json_encode(array('status' => 1, 'msg' => '访问成功', 'paidOrderList' => $paidOrderList)); + echo json_encode(array('status' => 1, 'msg' => '成功获取待处理', 'paidOrderList' => $paidOrderList)); } else { echo json_encode(array('status' => 0, 'msg' => '暂无订单数据')); }