mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(admin): 修正订单时间计算逻辑

Browse Source 
- 将存储时间、配送时间和分割时间的计算逻辑从 $data 数组修改为 $order 数组
- 优化了时间判断和计算的代码结构，提高了代码可读性和维护性
This commit is contained in:
mkm 2024-11-11 11:26:32 +08:00
parent 4199943282
commit 520cb5875b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -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;
}