|
|
@@ -281,7 +281,7 @@ class OrderController extends ApiController
|
|
|
$q->where('order_status',$status);
|
|
|
}
|
|
|
})
|
|
|
- ->select(['id','order_sn','order_type','order_status','pay_money','goods_number','created_at','shop_id','note','shopping_cart'])
|
|
|
+ ->select(['id','order_sn','order_type','order_status','pay_money','goods_number','created_at','shop_id','note','shopping_cart','is_reserve','reserve_time'])
|
|
|
->orderBy('id','desc')
|
|
|
->paginate(10);
|
|
|
foreach ($list as $value){
|
|
|
@@ -350,7 +350,7 @@ class OrderController extends ApiController
|
|
|
$where = [['m_id',$m_id], ['is_del',0], ['id',$order_id]];
|
|
|
|
|
|
$order = Order::where($where)
|
|
|
- ->select(['id','order_sn','order_type','pay_type','m_id','note','order_status','pay_money','goods_number','shop_id','created_at','pack_price','table_number','diner_number','number','note','shopping_cart'])
|
|
|
+ ->select(['id','order_sn','order_type','pay_type','m_id','note','order_status','pay_money','goods_number','shop_id','created_at','pack_price','table_number','diner_number','number','note','shopping_cart','is_reserve','reserve_time'])
|
|
|
->first();
|
|
|
if (empty($order)) return $this->apiResponseError('订单不存在');
|
|
|
if ($order->{'order_type'} == 1) {//堂食打包费为0
|
