订单统计

app/admin/controller/order/DishesController.php

@@ -73,21 +73,20 @@ class DishesController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
-        } else if (!empty($where['order_id'])){
-            $where['order_id'] = ['in' ,[]];
         }
 
         $query = $this->doSelect($where, $field, $order);

app/admin/controller/order/GoodsController.php

@@ -88,21 +88,20 @@ class GoodsController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
-        } else if (!empty($where['order_id'])){
-            $where['order_id'] = ['in' ,[]];
         }
 
         // 自提订单        

app/admin/controller/order/KangyangCityController.php

@@ -86,18 +86,19 @@ class KangyangCityController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
 

app/admin/controller/order/NewCustomerController.php

@@ -87,18 +87,19 @@ class NewCustomerController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
 

app/admin/controller/order/PackagesController.php

@@ -91,18 +91,19 @@ class PackagesController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {

app/admin/controller/order/PartnerController.php

@@ -87,18 +87,19 @@ class PartnerController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
 

app/admin/controller/order/RechargeController.php

@@ -89,18 +89,19 @@ class RechargeController extends Curd
         }
 
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
 

app/admin/controller/order/ReferrerController.php

@@ -87,18 +87,19 @@ class ReferrerController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
         }
 

app/admin/controller/order/ServicesController.php

@@ -85,21 +85,20 @@ class ServicesController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
-        } else if (!empty($where['order_id'])){
-            $where['order_id'] = ['in' ,[]];
         }
 
         $query = $this->doSelect($where, $field, $order);

app/admin/controller/order/WholeController.php

@@ -164,21 +164,20 @@ class WholeController extends Curd
             }
         }
         // 付款时间
+        $payOrderIds = [];
         if ($timeType == 'pay' && !empty($where['order_addtimes'])) {
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
             $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
         }
-        if (!empty($orderIds) && !empty($payOrderIds)) {
+        if (!empty($where['order_id']) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($orderIds)) {
+        } elseif (!empty($where['order_id'])) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
-        } elseif (!empty($payOrderIds)) {
+        } elseif ($timeType == 'pay') {
             $where['order_id'] = ['in', implode(',', $payOrderIds)];
-        } else if (!empty($where['order_id'])){
-            $where['order_id'] = ['in' ,[]];
         }
         // 自提订单        
         if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP') {