订单筛选调整

app/admin/controller/order/DishesController.php

@@ -80,10 +80,10 @@ class DishesController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/GoodsController.php

@@ -95,10 +95,10 @@ class GoodsController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/KangyangCityController.php

@@ -93,10 +93,10 @@ class KangyangCityController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/NewCustomerController.php

@@ -95,10 +95,10 @@ class NewCustomerController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/PackagesController.php

@@ -98,10 +98,10 @@ class PackagesController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/PartnerController.php

@@ -94,10 +94,10 @@ class PartnerController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/RechargeController.php

@@ -96,12 +96,15 @@ class RechargeController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
+            $orderIds[] = '00';
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
+            $orderIds[] = '00';
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
+            $payOrderIds[] = '00';
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
 

app/admin/controller/order/ReferrerController.php

@@ -94,10 +94,10 @@ class ReferrerController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/ServicesController.php

@@ -92,10 +92,10 @@ class ServicesController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];

app/admin/controller/order/WholeController.php

@@ -171,10 +171,10 @@ class WholeController extends Curd
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($where['order_id']) && $timeType == 'pay') {
+        if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($where['order_id'])) {
+        } elseif (!empty($orderId)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];