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]); + } }