diff --git a/FlyCube/MpApi/Controller/AdminController.class.php b/FlyCube/MpApi/Controller/AdminController.class.php index 811be88..51e2c4e 100644 --- a/FlyCube/MpApi/Controller/AdminController.class.php +++ b/FlyCube/MpApi/Controller/AdminController.class.php @@ -731,7 +731,7 @@ class AdminController extends PublicController $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.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,o.received_time,o.shipped_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.paid_time,o.refundapply_time,o.received_time,o.shipped_time, rs.bind_route, rs.runing') // 选择字段,包括 bind_route 和 runing ->where($where) ->select(); diff --git a/FlyCube/MpApi/Controller/PlaneController.class.php b/FlyCube/MpApi/Controller/PlaneController.class.php index 74bfd6e..ae718f1 100644 --- a/FlyCube/MpApi/Controller/PlaneController.class.php +++ b/FlyCube/MpApi/Controller/PlaneController.class.php @@ -592,6 +592,14 @@ class PlaneController extends PublicController } if ($_REQUEST['shipment_status']) { $data['shipment_status'] = htmlspecialchars($_REQUEST['shipment_status']); + switch ($data['shipment_status']) { + case '已发货': + $data['shipped_time'] = time(); + break; + case '已送达': + $data['delivered_time'] = time(); + break; + } } if ($_REQUEST['refund_status']) { $data['refund_status'] = htmlspecialchars($_REQUEST['refund_status']); @@ -648,9 +656,19 @@ class PlaneController extends PublicController } if ($_REQUEST['shipment_status']) { $data['shipment_status'] = htmlspecialchars($_REQUEST['shipment_status']); + switch ($data['shipment_status']) { + case '已接单': + $data['received_time'] = time(); + break; + } } if ($_REQUEST['refund_status']) { $data['refund_status'] = htmlspecialchars($_REQUEST['refund_status']); + switch ($data['refund_status']) { + case '拒绝退': + $data['rejected_time'] = time(); + break; + } } if ($_REQUEST['by_plane_id']) { $data['by_plane_id'] = ($_REQUEST['by_plane_id'] == 'null') ? null : intval($_REQUEST['by_plane_id']);