|
|
@@ -92,13 +92,16 @@ class OrderSendService extends BaseService
|
|
|
OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $deliverId], ['option' => $option, 'finishTime' => $time]);
|
|
|
$hasDeliver = 0;
|
|
|
if ($option == 1) {
|
|
|
+ //有纸质配送单
|
|
|
$hasDeliver = 1;
|
|
|
}
|
|
|
if ($option == 2) {
|
|
|
+ //填单打单
|
|
|
$hasDeliver = 2;
|
|
|
}
|
|
|
OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType, 'hasDeliver' => $hasDeliver]);
|
|
|
|
|
|
+
|
|
|
//进入送达流程
|
|
|
$reachId = $actionIdList['reach'];
|
|
|
$data = ['actionId' => $reachId, 'orderId' => $id, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $reachId];
|