From 6d685a636c213ae62fc7a28ed55862c3b5802199 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 17 Apr 2023 12:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/v1/order/StoreOrderController.php   |  1 +
 crmeb/app/dao/order/StoreOrderDao.php                  | 10 ++++++----
 crmeb/app/services/order/StoreOrderServices.php        |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index 82ed1573e..fc166831d 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -605,6 +605,7 @@ class StoreOrderController
      * 订单统计数据
      * @param Request $request
      * @return mixed
+     * @throws \ReflectionException
      */
     public function data(Request $request)
     {
diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php
index 67c94b37c..c8a62c478 100644
--- a/crmeb/app/dao/order/StoreOrderDao.php
+++ b/crmeb/app/dao/order/StoreOrderDao.php
@@ -50,17 +50,19 @@ class StoreOrderDao extends BaseDao
         $realName = $where['real_name'] ?? '';
         $fieldKey = $where['field_key'] ?? '';
         $fieldKey = $fieldKey == 'all' ? '' : $fieldKey;
+        $status = $where['status'] ?? '';
+        unset($where['status']);
         return parent::search($where, $search)->when($isDel, function ($query) use ($where) {
             $query->where('is_del', $where['is_del']);
         })->when(isset($where['is_system_del']), function ($query) {
             $query->where('is_system_del', 0);
-        })->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
-            switch ((int)$where['status']) {
+        })->when($status !== '', function ($query) use ($where, $status) {
+            switch ((int)$status) {
                 case 0://未支付
                     $query->where('paid', 0)->where('status', 0)->where('refund_status', 0)->where('is_del', 0);
                     break;
                 case 1://已支付 未发货
-                    $query->where('paid', 1)->whereIn('status', [0, 4])->whereIn('refund_status', [0, 3])->when(isset($where['shipping_type']), function ($query) {
+                    $query->where('paid', 1)->where('status', 0)->whereIn('refund_status', [0, 3])->when(isset($where['shipping_type']), function ($query) {
                         $query->where('shipping_type', 1);
                     })->where('is_del', 0);
                     break;
@@ -95,7 +97,7 @@ class StoreOrderDao extends BaseDao
                     $query->where('is_del', 1);
                     break;
                 case 9://全部用户未删除的订单
-                    $query->where('is_del', 0);
+                    $query->whereIn('refund_status', [0, 3])->where('is_del', 0);
                     break;
             }
         })->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index a70f05b44..420d9e138 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -93,7 +93,7 @@ class StoreOrderServices extends BaseServices
     {
         [$page, $limit] = $this->getPageValue();
         $data = $this->dao->getOrderList($where, $field, $page, $limit, $with);
-        $count = $this->dao->count($where);
+        $count = $this->dao->count($where, false);
         $data = $this->tidyOrderList($data);
         foreach ($data as &$item) {
             $refund_num = array_sum(array_column($item['refund'], 'refund_num'));