From ac19a12b81e31cddf2fcf735789565762b469d97 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 7 Dec 2023 14:53:15 +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-=E9=80=80=E6=AC=BE=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Order.php | 23 +++++++++++++++++++----
 route/api.php                         |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index 1151f0d6..7c62ed97 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -2,8 +2,10 @@
 
 namespace app\controller\api\dataview;
 
+use app\common\dao\store\order\StoreOrderDao;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\common\repositories\store\order\StoreRefundOrderRepository;
 use crmeb\basic\BaseController;
 use think\App;
 use think\exception\ValidateException;
@@ -458,12 +460,16 @@ class Order extends BaseController
 
 
     // 订单列表
-    public function orderList(StoreOrderRepository $repository)
+    public function orderList(StoreOrderRepository $repository, StoreOrderDao $dao)
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['date','order_sn','order_type','keywords','username','mer_id','activity_type','group_order_sn','store_name']);
-        $where['reconciliation_type'] = $this->request->param('status', 1);
-        return app('json')->success($repository->adminMerGetList($where, $page, $limit));
+        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','is_trader','activity_type','group_order_sn','store_name']);
+        $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'));
     }
 
     // 订单列表统计标题
@@ -476,5 +482,14 @@ class Order extends BaseController
         return app('json')->success($data);
     }
 
+    // 退款订单列表
+    public function refundOrderList(StoreRefundOrderRepository $repository)
+    {
+        [$page,$limit] = $this->getPage();
+        $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
+        $list = $repository->getAllList($where, $page, $limit);
+        unset($list['stat']);
+        return app('json')->success($list);
+    }
 
 }
\ No newline at end of file
diff --git a/route/api.php b/route/api.php
index 4737f9bf..d9fcf441 100644
--- a/route/api.php
+++ b/route/api.php
@@ -738,6 +738,7 @@ Route::group('api/', function () {
         Route::get('curr_day_order_amount', 'Order/currDayOrderAmount');
         Route::get('order_list', 'Order/orderList');
         Route::get('order_list_count_title', 'Order/orderCountTitle');
+        Route::get('refund_order_list', 'Order/refundOrderList');
 
         // api.dataview.User
         Route::get('user_merchat_count', 'User/userMerchantCount');