From 9c2aa1b1caa37a66224d27ad2e08f9208ca73405 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 17 Oct 2023 15:34:20 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=8A=BC=E9=87=91=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E5=AF=B9=E5=85=AC=E8=B4=A6=E6=88=B7=E4=B8=B4=E6=97=B6=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php |  5 +++--
 app/adminapi/lists/CompanyLists.php           | 11 +++++++++++
 app/api/controller/CompanyController.php      | 11 +++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 19a34d17b..04fdd524c 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -537,8 +537,9 @@ class CompanyController extends BaseAdminController
     public function getDepositRechargeTransferVoucherList()
     {
         $companyId = $this->request->param('company_id');
-        $list = CompanyDepositVoucher::where(['company_id' => $companyId])->select()->toArray();
-        return $this->success('成功',$list);
+        $re = (new CompanyLists())->list_three($companyId);
+
+        return $this->success('成功', $re);
     }
 
 
diff --git a/app/adminapi/lists/CompanyLists.php b/app/adminapi/lists/CompanyLists.php
index 5cffae93e..97a875046 100644
--- a/app/adminapi/lists/CompanyLists.php
+++ b/app/adminapi/lists/CompanyLists.php
@@ -19,6 +19,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\Company;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\auth\Admin;
+use app\common\model\CompanyDepositVoucher;
 use think\facade\Db;
 
 
@@ -133,6 +134,16 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
             ->toArray();
             return ['list'=>$list,'page_no'=>$this->limitOffset+1,'page_size'=>$this->limitLength,'count'=>$count];
     }
+    public function list_three($companyId): array
+    {
+        $list = CompanyDepositVoucher::where(['company_id' => $companyId])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+        $count=CompanyDepositVoucher::where(['company_id' => $companyId])->count();
+        return ['list'=>$list,'page_no'=>$this->limitOffset+1,'page_size'=>$this->limitLength,'count'=>$count];
+    }
     /**
      * @notes 获取数量
      * @return int
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index fee9ae7a2..ef41b354f 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -7,6 +7,7 @@ use app\common\logic\contract\ContractLogic;
 use app\common\model\auth\Admin;
 use app\common\model\Company;
 use app\common\model\company\CompanyAccountLog;
+use app\common\model\CompanyDepositVoucher;
 use app\common\model\contract\Contract;
 use app\common\model\task\Task;
 use app\common\model\user\User;
@@ -373,4 +374,14 @@ class CompanyController extends BaseApiController
         }
         return $this->success('成功',$re);
     }
+
+    public function getDepositRechargeTransferVoucherList()
+    {
+        [$page, $limit] = $this->getPage();
+        $list = CompanyDepositVoucher::where(['company_id' => $this->userInfo['company_id']])
+            ->order(['id' => 'desc'])
+            ->page($page)->limit($limit)->select();;
+        $count=CompanyDepositVoucher::where(['company_id' => $this->userInfo['company_id']])->count();
+        return $this->success('success', ['count' => $count, 'data' => $list]);
+    }
 }