完善功能

app/admin/controller/order/GoodsController.php

@@ -37,7 +37,7 @@ class GoodsController extends Curd{
 
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
-        $where['pay_detail.pay_category'] = 'GOODS';
+        // $where['pay_detail.pay_category'] = 'GOODS';
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
             $where['order_is_complete'] = 'N';
         }
@@ -50,9 +50,9 @@ class GoodsController 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 = 'GOODS';
             $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 GoodsController extends Curd{
                     $where['order_id'] = ['in',implode(',',$orderIds)];
                 }
             }
-        }
+        // }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);

app/admin/controller/order/PackagesController.php

@@ -37,7 +37,7 @@ class PackagesController extends Curd{
 
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
-        $where['order_category'] = 'PACKAGE';
+        // $where['order_category'] = 'PACKAGE';
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
             $where['order_is_complete'] = 'N';
         }
@@ -50,9 +50,9 @@ class PackagesController 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 = 'PACKAGE';
             $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 PackagesController extends Curd{
                     $where['order_id'] = ['in',implode(',',$orderIds)];
                 }
             }
-        }
+        // }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);

app/admin/controller/order/ServicesController.php

@@ -37,7 +37,7 @@ class ServicesController extends Curd{
 
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
-        $where['order_category'] = ['in','SERVICE,CHNMED,CHNNCD'];
+        // $where['order_category'] = ['in','SERVICE,CHNMED,CHNNCD'];
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
             $where['order_is_complete'] = 'N';
         }
@@ -52,7 +52,7 @@ class ServicesController extends Curd{
         // }
         if ($request->get('goods_classify') || $request->get('goods_name')){
             $where['order_id'] = '';
-            $goodsClassify = $request->get('goods_classify','');
+            $goodsClassify = 'SERVICE';
             $goodsName = $request->get('goods_name','');
             if (!empty($goodsName) && empty($goodsClassify)){
                 $goodsIds = Goods::where('goods_name','like','%'.$request->get('goods_name').'%')->pluck('goods_id')->toArray();