订单筛选

app/admin/controller/order/DishesController.php

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

app/admin/controller/order/GoodsController.php

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

app/admin/controller/order/KangyangCityController.php

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

app/admin/controller/order/NewCustomerController.php

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

app/admin/controller/order/PackagesController.php

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

app/admin/controller/order/PartnerController.php

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

app/admin/controller/order/RechargeController.php

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

app/admin/controller/order/ReferrerController.php

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

app/admin/controller/order/ServicesController.php

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

app/admin/controller/order/WholeController.php

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