订单查询

app/admin/controller/order/DishesController.php

@@ -30,6 +30,7 @@ class DishesController extends Curd{
     public function select(Request $request): Response
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
+
         if (!empty($where['order_addtimes'])) {
             $where['order_addtimes'][0] = strtotime($where['order_addtimes'][0]);
             $where['order_addtimes'][1] = strtotime($where['order_addtimes'][1]);
@@ -52,8 +53,8 @@ class DishesController extends Curd{
         //     $where['order_return.order_return_status'] = $request->get('return');
         // }
         // if ($request->get('goods_classify') || $request->get('goods_name')){
-            $where['order_id'] = '';
-            $goodsClassify = 'MEALS';
+//            $where['order_id'] = '';
+            $goodsClassify = $request->get('goods_classify', '');
             $goodsName = $request->get('goods_name','');
             if (!empty($goodsName) && empty($goodsClassify)){
                 $goodsIds = Goods::where('goods_name','like','%'.$request->get('goods_name').'%')->pluck('goods_id')->toArray();
@@ -70,14 +71,13 @@ class DishesController extends Curd{
 
                 $goodsIds = $goodsModel->pluck('goods_id')->toArray();
             }
-            if($goodsIds){
+            if(!empty($goodsIds)){
                 $orderIds = OrderSheet::whereIn('join_sheet_goods_id',$goodsIds)->pluck('join_sheet_order_id')->toArray();
                 if($orderIds){
                     $where['order_id'] = ['in',implode(',',$orderIds)];
                 }
             }
         // }
-
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }