订单筛选调整

app/admin/controller/order/WholeController.php

@@ -527,10 +527,10 @@ class WholeController extends Curd
                 if (isset($orderExtendJson['free_remark'])) {
                     $order->free_remark = $orderExtendJson['free_remark'];
                 }
-                if ($order->order_status_payment == 'AWAITING' && !empty($orderExtendJson['awaiting_times'])){
+                if ($order->order_status_payment == 'AWAITING' && !empty($orderExtendJson['awaiting_times'])) {
                     $order->awaiting_times = $orderExtendJson['awaiting_times'];
-                }elseif ($order->order_status_payment == 'AWAITING' && empty($orderExtendJson['awaiting_times'])){
-                    $order->awaiting_times = date('Y-m-d H:i:s',strtotime($order->order_addtimes));
+                } elseif ($order->order_status_payment == 'AWAITING' && empty($orderExtendJson['awaiting_times'])) {
+                    $order->awaiting_times = date('Y-m-d H:i:s', strtotime($order->order_addtimes));
                 }
             }
             $discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
@@ -4367,9 +4367,14 @@ class WholeController extends Curd
         $type = $request->get('type', '');
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
 
+        $orderClassify = [];
         if ($request->get('goods_classify') && $request->get('goods_classify') == 'SERVICE') {
+            $orderClassify = ['SERVICE', 'CHNMED', 'CHNNCD'];
             $where['order_classify'] = ['in', 'SERVICE,CHNMED,CHNNCD'];
+        } else if ($request->get('goods_classify') && $request->get('goods_classify') == 'DISHES') {
+            $orderClassify = ['MEALS'];
         } else if ($request->get('goods_classify')) {
+            $orderClassify = [$request->get('goods_classify')];
             $where['order_classify'] = $request->get('goods_classify');
         }
 
@@ -4418,12 +4423,12 @@ class WholeController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, $orderClassify);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($orderId) && !empty($payOrderIds)) {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif (!empty($payOrderIds)) {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];