From fec6d0236b27565403f02597fec01327b1f21545 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Thu, 7 Dec 2023 14:55:19 +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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index 7c62ed97..09ae3cc7 100755 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -3,6 +3,7 @@ namespace app\controller\api\dataview; use app\common\dao\store\order\StoreOrderDao; +use app\common\dao\store\order\StoreRefundOrderDao; use app\common\repositories\BaseRepository; use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreRefundOrderRepository; @@ -483,13 +484,15 @@ class Order extends BaseController } // 退款订单列表 - public function refundOrderList(StoreRefundOrderRepository $repository) + public function refundOrderList(StoreRefundOrderRepository $repository, StoreRefundOrderDao $dao) { + [$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); + $query = $dao->search($where); + $count = $query->count(); + $list = $query->page($page, $limit)->select(); + return app('json')->success(compact('count', 'list')); } } \ No newline at end of file