From c08ff6d9dd726d4a09bee87ed2d8098b8b0f5acd Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 7 Dec 2023 16:57:54 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=95=B0=E6=8D=AE=E4=B9=8B=E7=9C=BC-?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1-=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E8=B5=84=E9=87=91=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Finance.php | 47 +++++++++++++++++++++++++
 app/controller/api/dataview/Order.php   |  5 ---
 route/api.php                           |  6 ++++
 3 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 app/controller/api/dataview/Finance.php

diff --git a/app/controller/api/dataview/Finance.php b/app/controller/api/dataview/Finance.php
new file mode 100644
index 00000000..e96c9617
--- /dev/null
+++ b/app/controller/api/dataview/Finance.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace app\controller\api\dataview;
+
+use app\common\repositories\BaseRepository;
+use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserExtractRepository;
+use crmeb\basic\BaseController;
+use think\App;
+use think\exception\ValidateException;
+class Finance extends BaseController
+{
+    /**
+     * @var repository
+     */
+    protected $repository;
+
+    public $areaCode; // 区县地区码
+
+    public $streetCode; // 镇街道地区码
+
+    public function __construct(App $app, BaseRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+        $this->areaCode = $this->request->param('areaCode', '');
+        $this->streetCode = $this->request->param('streetCode', '');
+
+        if ($this->areaCode == '' && $this->streetCode == '') {
+            throw  new ValidateException('请选择地区');
+        }
+    }
+
+    public function withdrawList(UserExtractRepository $repository)
+    {
+        [$page,$limit] = $this->getPage();
+        $where = $this->request->params(['status','keyword','date','extract_type']);
+        return app('json')->success($repository->getList($where,$page,$limit));
+    }
+
+    public function billList(UserBillRepository $repository)
+    {
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params(['keyword', 'date', 'type']);
+        return app('json')->success($repository->getList($where, $page, $limit));
+    }
+}
\ No newline at end of file
diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index 82d04d42..a40535e9 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -23,11 +23,6 @@ class Order extends BaseController
 
     public $streetCode; // 镇街道地区码
 
-    /**
-     * StoreBrand constructor.
-     * @param App $app
-     * @param repository $repository
-     */
     public function __construct(App $app, BaseRepository $repository)
     {
         parent::__construct($app);
diff --git a/route/api.php b/route/api.php
index 6b172c12..07025988 100644
--- a/route/api.php
+++ b/route/api.php
@@ -756,6 +756,12 @@ Route::group('api/', function () {
         // api.dataview.Merchant
         Route::get('merchant_list', 'Merchant/merchantList');
 
+        // api.dataview.Finance
+        Route::get('withdraw_list', 'Finance/withdrawList');
+        Route::get('bill_list', 'Finance/billList');
+
+
+
         /**---------------------数据之眼可视化大屏api-------------------- end */