|
@@ -30,6 +30,8 @@ trait LogisticSyncTrait
|
|
|
}
|
|
}
|
|
|
/** @var \Carbon\Carbon $sent_at */
|
|
/** @var \Carbon\Carbon $sent_at */
|
|
|
$sent_at = $orderPackage->sent_at;
|
|
$sent_at = $orderPackage->sent_at;
|
|
|
|
|
+ /** @var \Carbon\Carbon $issue_time 订单下发时间 */
|
|
|
|
|
+ $issue_time = $orderPackage->order->created_at;
|
|
|
/**执行该方法时,默认没有异常,
|
|
/**执行该方法时,默认没有异常,
|
|
|
*1. 之前有异常的件,
|
|
*1. 之前有异常的件,
|
|
|
* 1.1 新的状态是无异常的可以更新为正常
|
|
* 1.1 新的状态是无异常的可以更新为正常
|
|
@@ -39,22 +41,20 @@ trait LogisticSyncTrait
|
|
|
* 2.2 新的状态异常更新为对应异常
|
|
* 2.2 新的状态异常更新为对应异常
|
|
|
*/
|
|
*/
|
|
|
$data['exception_status'] = '';
|
|
$data['exception_status'] = '';
|
|
|
- $created_at = Carbon::parse($orderPackage->created_at);
|
|
|
|
|
//当天的16:30
|
|
//当天的16:30
|
|
|
$transfer_status = $data['transfer_status'] ?? [];
|
|
$transfer_status = $data['transfer_status'] ?? [];
|
|
|
if (empty($sent_at)) {//没复核
|
|
if (empty($sent_at)) {//没复核
|
|
|
if (empty($transfer_status)) {//没有路由信息
|
|
if (empty($transfer_status)) {//没有路由信息
|
|
|
//延迟发货
|
|
//延迟发货
|
|
|
- $created_at_clone = deep_copy($created_at);
|
|
|
|
|
- if ($created_at->gt($created_at_clone->startOfDay()->addHours(23)->addMinutes(59))) {//下午23:59的单
|
|
|
|
|
- $created_at_clone = deep_copy($created_at);
|
|
|
|
|
- if ($created_at_clone->addDay()->endOfDay()->lt(now())) {//超过第二天的24时
|
|
|
|
|
- $created_at_clone = deep_copy($created_at);
|
|
|
|
|
|
|
+ $issue_time_clone = deep_copy($issue_time);
|
|
|
|
|
+ if ($issue_time->gt($issue_time_clone->startOfDay()->addHours(16)->addMinutes(30))) {//下午16:30的单
|
|
|
|
|
+ $issue_time_clone = deep_copy($issue_time);
|
|
|
|
|
+ if ($issue_time_clone->addDay()->endOfDay()->lt(now())) {//超过第二天的24时
|
|
|
$data['exception_status'] = '延迟发货';
|
|
$data['exception_status'] = '延迟发货';
|
|
|
$data['is_delay_deliver'] = true;
|
|
$data['is_delay_deliver'] = true;
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- if ($created_at_clone->endOfDay()->lt(now())) {//超过当天的24时
|
|
|
|
|
|
|
+ if ($issue_time_clone->endOfDay()->lt(now())) {//超过当天的24时
|
|
|
$data['exception_status'] = '延迟发货';
|
|
$data['exception_status'] = '延迟发货';
|
|
|
$data['is_delay_deliver'] = true;
|
|
$data['is_delay_deliver'] = true;
|
|
|
}
|
|
}
|