From c76f39f0d0e54e6a214bc3965be2bb662ba568ed Mon Sep 17 00:00:00 2001 From: air <30444667+sszdot@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:41:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?= =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?= =?UTF-8?q?=EF=BC=9A=E6=95=B0=E6=8D=AE=E5=BA=93=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=20=E6=96=B0=E5=8A=A0=20=E5=90=8C=E6=84=8F=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=97=B6=E9=97=B4=20=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E4=BD=8D=E7=BD=AE=E5=8F=96=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=20=E8=8E=B7=E5=8F=96=E6=AD=A4=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=87=8C=E9=9D=A2=20=E6=B7=BB=E5=8A=A0refundargee=5Ft?= =?UTF-8?q?ime=E5=AD=97=E6=AE=B5=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?= =?UTF-8?q?=E3=80=91=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # 类型 包含: # feat：新功能（feature） # fix：修补bug # docs：文档（documentation） # style： 格式（不影响代码运行的变动） # refactor：重构（即不是新增功能，也不是修改bug的代码变动） # test：增加测试 # chore：构建过程或辅助工具的变动 --- FlyCube/Api/Controller/CheckController.class.php | 2 +- FlyCube/MpApi/Controller/AdminController.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FlyCube/Api/Controller/CheckController.class.php b/FlyCube/Api/Controller/CheckController.class.php index dceee48..dbd6a92 100644 --- a/FlyCube/Api/Controller/CheckController.class.php +++ b/FlyCube/Api/Controller/CheckController.class.php @@ -221,7 +221,7 @@ class CheckController extends PublicController */ public function getOrderList() { - $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'); + $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,refundagree_time,rejected_time'); $where['openid'] = $this->openid; $where['main_status'] = array('neq', '已取消'); //排除已取消的订单 $orderDb = D('order'); diff --git a/FlyCube/MpApi/Controller/AdminController.class.php b/FlyCube/MpApi/Controller/AdminController.class.php index 9ba80b3..0478955 100644 --- a/FlyCube/MpApi/Controller/AdminController.class.php +++ b/FlyCube/MpApi/Controller/AdminController.class.php @@ -740,7 +740,7 @@ class AdminController extends PublicController ->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,transport_price,pack_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.paid_time,o.refundapply_time,o.received_time,o.shipped_time, rs.bind_route, rs.runing') // 选择字段，包括 bind_route 和 runing + shop_id,o.order_sn,o.food_sn,o.total_weight,o.total_num,o.total_price,transport_price,pack_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.paid_time,o.refundapply_time,o.refundagree_time,o.received_time,o.shipped_time, rs.bind_route, rs.runing') // 选择字段，包括 bind_route 和 runing ->where($where) ->select(); @@ -831,7 +831,7 @@ class AdminController extends PublicController if ($_REQUEST['id']) { $where['id'] = $_REQUEST['id']; $orderDb = D('order'); - $field = array('id', 'order_sn', 'food_sn', 'total_weight', 'total_num', 'total_price', 'transport_price', 'pack_price', 'refund_price', 'apply_price', 'receiver', 'tel', 'by_plane_id', 'receive_site_id', 'receive_site_name', 'remark', 'product_snapshot', 'main_status', 'shipment_status', 'refund_status', 'refund_remark', 'canceled_time', 'order_time', 'paid_time', 'refunded_time', 'completed_time', 'received_time', 'shipped_time', 'delivered_time', 'refundapply_time', 'rejected_time', 'describe'); + $field = array('id', 'order_sn', 'food_sn', 'total_weight', 'total_num', 'total_price', 'transport_price', 'pack_price', 'refund_price', 'apply_price', 'receiver', 'tel', 'by_plane_id', 'receive_site_id', 'receive_site_name', 'remark', 'product_snapshot', 'main_status', 'shipment_status', 'refund_status', 'refund_remark', 'canceled_time', 'order_time', 'paid_time', 'refunded_time', 'completed_time', 'received_time', 'shipped_time', 'delivered_time', 'refundapply_time', 'refundagree_time', 'rejected_time', 'describe'); if ($orderDetails = $orderDb->where($where)->field($field)->find()) { echo json_encode(array('status' => 1, 'msg' => '访问成功', 'orderDetails' => $orderDetails)); } else {