diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index c849b3d27..31de88987 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -563,14 +563,14 @@ class BeforehandOrderLogic extends BaseLogic // 判断时间是否小于18点 if ($hour < 18) { // 时间小于18点的逻辑 - $data['storage_time'] = $dateTime->modify('+60 minutes')->format('Y-m-d H:i:s'); - $data['delivery_time'] = $dateTime->modify('+90 minutes')->format('Y-m-d H:i:s'); + $order['storage_time'] = $dateTime->modify('+60 minutes')->format('Y-m-d H:i:s'); + $order['delivery_time'] = $dateTime->modify('+90 minutes')->format('Y-m-d H:i:s'); } else { // 时间大于或等于18点的逻辑 - $data['storage_time'] = $dateTime->modify('+150 minutes')->format('Y-m-d H:i:s'); - $data['delivery_time'] = $dateTime->modify('+205 minutes')->format('Y-m-d H:i:s'); + $order['storage_time'] = $dateTime->modify('+150 minutes')->format('Y-m-d H:i:s'); + $order['delivery_time'] = $dateTime->modify('+205 minutes')->format('Y-m-d H:i:s'); } - $data['split_time'] = $dateTime->modify('+10 minutes')->format('Y-m-d H:i:s'); + $order['split_time'] = $dateTime->modify('+10 minutes')->format('Y-m-d H:i:s'); $file_path = $order_allocation->export($data, $order, $other_data); return $file_path; }