|
|
@@ -455,12 +455,18 @@ class OrderClass extends BaseClass
|
|
|
$sendTime = strtotime(date("Y-m-d ") . $hour);
|
|
|
OrderSendClass::thirdSend($order);
|
|
|
*/
|
|
|
+ $sendTime = $order->sendTime;
|
|
|
+ if($sendTime =='0000-00-00 00:00:00'){
|
|
|
+ $sendTime = time();
|
|
|
+ }else{
|
|
|
+ $sendTime = strtotime($order->sendTime);
|
|
|
+ }
|
|
|
$expData = [
|
|
|
'orderId' => $id,
|
|
|
'orderSn' => $orderSn,
|
|
|
'sjId' => $sjId,
|
|
|
'expressId' => $expressId,
|
|
|
- 'sendTime' => strtotime($order->sendTime),
|
|
|
+ 'sendTime' => $sendTime,
|
|
|
'cost' => $dadaRes['fee'],
|
|
|
'distance' => $dadaRes['distance'],
|
|
|
'status' => 1,
|