Browse Source

完善功能

gorden 7 months ago
parent
commit
44d0c1dbcd
1 changed files with 3 additions and 3 deletions
  1. 3 3
      app/admin/controller/order/DishesController.php

+ 3 - 3
app/admin/controller/order/DishesController.php

@@ -50,9 +50,9 @@ class DishesController extends Curd{
         // if ($request->get('return')){
         //     $where['order_return.order_return_status'] = $request->get('return');
         // }
-        if ($request->get('goods_classify') || $request->get('goods_name')){
+        // if ($request->get('goods_classify') || $request->get('goods_name')){
             $where['order_id'] = '';
-            $goodsClassify = $request->get('goods_classify','');
+            $goodsClassify = 'MEALS';
             $goodsName = $request->get('goods_name','');
             if (!empty($goodsName) && empty($goodsClassify)){
                 $goodsIds = Goods::where('goods_name','like','%'.$request->get('goods_name').'%')->pluck('goods_id')->toArray();
@@ -75,7 +75,7 @@ class DishesController extends Curd{
                     $where['order_id'] = ['in',implode(',',$orderIds)];
                 }
             }
-        }
+        // }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);