|
@@ -76,10 +76,11 @@ class Orders extends Auth{
|
|
|
$list = $OrdersProduct->query()
|
|
|
->join('custom','orders_product.custom_uid','=','custom.uid')
|
|
|
->join('orders_addr','orders_addr.order_id','=','orders_product.order_id')
|
|
|
+ ->leftJoin('orders','orders.id','=','orders_product.order_id')
|
|
|
->where($map)
|
|
|
->orderByDesc('id')
|
|
|
->select([
|
|
|
- 'orders_product.*','custom.username as custom_name',
|
|
|
+ 'orders_product.*','custom.username as custom_name','orders.regiment_id as regiment_id',
|
|
|
'orders_addr.contact_name','orders_addr.contact_shop','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
|
|
|
])
|
|
|
->paginate(request('limit',config('page_num',10)))->appends(request()->all());
|