|
|
@@ -356,12 +356,17 @@ class OrderController extends BaseController
|
|
|
util::fail('配送时间至少提前6分钟');
|
|
|
}
|
|
|
}else{
|
|
|
- //默认30分钟后
|
|
|
- $sendTime = date('Y-m-d H:i:s',strtotime("+30 minutes"));
|
|
|
+ //默认立即发送
|
|
|
+ $sendTime = 0;
|
|
|
}
|
|
|
//更新订单表
|
|
|
$info = OrderService::getOrderInfo($orderId);
|
|
|
OrderClass::valid($info, $this->shopId);
|
|
|
+ if($sendTime){
|
|
|
+ $sendTime =date('Y-m-d H:i', strtotime($sendTime));
|
|
|
+ }else{
|
|
|
+ $sendTime = '0000-00-00 00:00:00';
|
|
|
+ }
|
|
|
$expressAddInfo = [
|
|
|
'customName' => $customName,
|
|
|
'customMobile' => $customMobile,
|