订单列表-修改-列表

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

@@ -4635,33 +4635,35 @@ class StoreOrderRepository extends BaseRepository
     public function adminOrderNumber($orderType = -1, $where = [])
     {
         $order_ids = input('order_ids', '');
+        $where['order_type'] = $orderType;
+
         //        $where['order_type'] = $orderType;
         //1: 未支付 2: 未发货 3: 待收货 4: 待评价 5: 交易完成 6: 已退款 7: 已删除
-        $all = $this->dao->search(array_merge(['order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        $all = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
         $statusAll = $all;
-        $unpaid = $this->dao->search(array_merge(['paid' => 0, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        $unpaid = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
-        $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) {
+        })->where(['paid' => 0, 'is_del' => 0])->count();
+        $unshipped = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
-        $untake = $this->dao->search(array_merge(['status' => 1, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        })->where(['status' => 0, 'paid' => 1, 'is_del' => 0])->count();
+        $untake = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
-        $unevaluate = $this->dao->search(array_merge(['status' => 2, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        })->where(['status' => 1, 'is_del' => 0])->count();
+        $unevaluate = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
-        $complete = $this->dao->search(array_merge(['status' => 3, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        })->where(['status' => 2, 'is_del' => 0])->count();
+        $complete = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
-        $refund = $this->dao->search(array_merge(['status' => -1, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        })->where(['status' => 3, 'is_del' => 0])->count();
+        $refund = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
-        $del = $this->dao->search(array_merge(['is_del' => 1, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
+        })->where(['status' => -1])->count();
+        $del = $this->dao->search($where, null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
-        })->count();
+        })->where(['is_del' => 1])->count();
 
         return compact('all', 'statusAll', 'unpaid', 'unshipped', 'untake', 'unevaluate', 'complete', 'refund', 'del');
     }