|
|
@@ -221,7 +221,7 @@ class OrderController extends ApiController
|
|
|
$q->where('order_status',$status);
|
|
|
}
|
|
|
})
|
|
|
- ->select(['id','order_sn','order_status','pay_money','goods_number','created_at','shop_id'])
|
|
|
+ ->select(['id','order_sn','order_status','pay_money','goods_number','created_at','shop_id','note'])
|
|
|
->orderBy('id','desc')
|
|
|
->paginate(10);
|
|
|
foreach ($list as $value){
|
|
|
@@ -231,7 +231,7 @@ class OrderController extends ApiController
|
|
|
$value->{'item'} = OrderItem::from('order_item as o')
|
|
|
->leftJoin('goods as g', 'o.goods_id', '=', 'g.id')
|
|
|
->where('o.order_id',$value->{'id'})
|
|
|
- ->select(['o.id','o.goods_id','o.goods_name','o.goods_img','g.status'])
|
|
|
+ ->select(['o.id','o.goods_id','o.goods_name','o.goods_img','o.goods_number','g.status'])
|
|
|
->orderBy('o.id','asc')
|
|
|
->get();
|
|
|
$value->initializeModel();
|
|
|
@@ -290,7 +290,7 @@ class OrderController extends ApiController
|
|
|
$where = [['m_id',$m_id], ['is_del',0], ['id',$order_id]];
|
|
|
|
|
|
$order = Order::where($where)
|
|
|
- ->select(['id','order_sn','pay_type','m_id','note','order_status','pay_money','goods_number','shop_id','created_at','pack_price','table_number','diner_number','number'])
|
|
|
+ ->select(['id','order_sn','pay_type','m_id','note','order_status','pay_money','goods_number','shop_id','created_at','pack_price','table_number','diner_number','number','note'])
|
|
|
->first();
|
|
|
if (empty($order)) return $this->apiResponseError('订单不存在');
|
|
|
if ($order->{'order_type'} == 1) {//堂食打包费为0
|
|
|
@@ -300,7 +300,7 @@ class OrderController extends ApiController
|
|
|
$order->{'item'} = OrderItem::from('order_item as o')
|
|
|
->leftJoin('goods as g', 'o.goods_id', '=', 'g.id')
|
|
|
->where('o.order_id',$order_id)
|
|
|
- ->select(['o.id','o.goods_id','o.goods_name','o.goods_img','o.goods_attr','o.goods_number','o.goods_price','o.goods_spec_list','g.status'])
|
|
|
+ ->select(['o.id','o.goods_id','o.goods_name','o.goods_img','o.goods_attr','o.goods_number','o.goods_price','o.goods_money','o.goods_spec_list','g.status'])
|
|
|
->orderBy('o.id','asc')
|
|
|
->get();
|
|
|
|
