订单列表-修改-列表

app/common/repositories/store/order/StoreOrderRepository.php

@@ -4641,25 +4641,25 @@ class StoreOrderRepository extends BaseRepository
             $q->whereIn('order_id', $order_ids);
         })->count();
         $statusAll = $all;
-        $unpaid = $this->dao->search(array_merge($where, ['paid' => 0, 'is_del' => 0, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $unpaid = $this->dao->search(array_merge(['paid' => 0, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $unshipped = $this->dao->search(array_merge($where, ['status' => 0, 'paid' => 1, 'is_del' => 0, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $unshipped = $this->dao->search(array_merge(['status' => 0, 'paid' => 1, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $untake = $this->dao->search(array_merge($where, ['status' => 1, 'is_del' => 0, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $untake = $this->dao->search(array_merge(['status' => 1, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $unevaluate = $this->dao->search(array_merge($where, ['status' => 2, 'is_del' => 0, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $unevaluate = $this->dao->search(array_merge(['status' => 2, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $complete = $this->dao->search(array_merge($where, ['status' => 3, 'is_del' => 0, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $complete = $this->dao->search(array_merge(['status' => 3, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $refund = $this->dao->search(array_merge($where, ['status' => -1, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $refund = $this->dao->search(array_merge(['status' => -1, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $del = $this->dao->search(array_merge($where, ['is_del' => 1, 'order_type' => $orderType]), null)->when($order_ids, function ($q) use ($order_ids) {
+        $del = $this->dao->search(array_merge(['is_del' => 1, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
 

app/controller/admin/order/Order.php

@@ -101,7 +101,7 @@ class Order extends BaseController
      */
     public function chart()
     {
-        $where = $this->request->params(['type', 'date', 'mer_id','keywords','username','order_sn','order_ids']);
+        $where = $this->request->params(['type', 'date', 'mer_id','keywords','username','order_sn','order_ids','paid']);
         return app('json')->success($this->repository->adminOrderNumber(-1, $where));
     }