From 8dd3daefaa97e0aa0ff0a8512a0268f58f2a87e4 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 7 Dec 2023 16:07:25 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=95=B0=E6=8D=AE=E4=B9=8B=E7=9C=BC-?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E6=A0=B8=E9=94=80=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E6=A0=B8=E9=94=80=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Order.php | 30 +++++++++++++++++++++++++++
 route/api.php                         |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index 09ae3cc7..82d04d42 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -495,4 +495,34 @@ class Order extends BaseController
         return app('json')->success(compact('count', 'list'));
     }
 
+    // 核销订单
+    public function takeOrderList(StoreOrderRepository $repository, StoreOrderDao $dao)
+    {
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params(['date','order_sn','keywords','username','is_trader']);
+        $where['take_order'] = 1;
+        $where['status'] = '';
+        $where['verify_date'] = $where['date'];
+        unset($where['date']);
+        $status = $where['status'];
+        unset($where['status']);
+        $query = $dao->search($where, null)->where($repository->getOrderType($status));
+        $count = $query->count();
+        $list = $query->page($page, $limit)->select();
+        return app('json')->success(compact('count', 'list'));
+    }
+
+    public function takeOrderCountTitle(StoreOrderRepository $repository)
+    {
+        $where = $this->request->params(['date','order_sn','keywords','username','is_trader']);
+        $where['take_order'] = 1;
+        $where['status'] = '';
+        $where['verify_date'] = $where['date'];
+        unset($where['date']);
+        $data[0] = $repository->getStat($where, '')[0];
+        $data[1] = $repository->getStat($where, '')[1];
+        $data[2] = $repository->getStat($where, '')[2];
+        return app('json')->success($data);
+    }
+
 }
\ No newline at end of file
diff --git a/route/api.php b/route/api.php
index d9fcf441..6b172c12 100644
--- a/route/api.php
+++ b/route/api.php
@@ -739,6 +739,8 @@ Route::group('api/', function () {
         Route::get('order_list', 'Order/orderList');
         Route::get('order_list_count_title', 'Order/orderCountTitle');
         Route::get('refund_order_list', 'Order/refundOrderList');
+        Route::get('take_order_list', 'Order/takeOrderList');
+        Route::get('take_order_count_title', 'Order/takeOrderCountTitle');
 
         // api.dataview.User
         Route::get('user_merchat_count', 'User/userMerchantCount');