|
@@ -195,7 +195,7 @@ class OrderController extends O2oBaseController{
|
|
$order->order_time = time();
|
|
$order->order_time = time();
|
|
//双十一暂用
|
|
//双十一暂用
|
|
if ($flag_book){
|
|
if ($flag_book){
|
|
- $order->booking_time = '';
|
|
|
|
|
|
+ $order->booking_time = '1466056800';
|
|
}else{
|
|
}else{
|
|
$order->booking_time = strtotime($booking_time);
|
|
$order->booking_time = strtotime($booking_time);
|
|
}
|
|
}
|
|
@@ -237,6 +237,7 @@ class OrderController extends O2oBaseController{
|
|
}else{
|
|
}else{
|
|
$order->status = 0;
|
|
$order->status = 0;
|
|
//双十一暂用 start
|
|
//双十一暂用 start
|
|
|
|
+ var_dump($order);exit;
|
|
/*if($flag_book) {
|
|
/*if($flag_book) {
|
|
CommonFn::requestAjax(false,CommonFn::getMessage('o2o','order_create_false'));
|
|
CommonFn::requestAjax(false,CommonFn::getMessage('o2o','order_create_false'));
|
|
}*/
|
|
}*/
|