From 0a0fba85dfda7bd4e7558a28a34915787f760c75 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Fri, 14 Jun 2024 16:16:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/FinancialTransfersController.php | 3 +- .../FinancialTransfersLists.php | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 app/store/lists/financial_transfers/FinancialTransfersLists.php diff --git a/app/store/controller/finance/FinancialTransfersController.php b/app/store/controller/finance/FinancialTransfersController.php index 850222a6a..af30a569c 100644 --- a/app/store/controller/finance/FinancialTransfersController.php +++ b/app/store/controller/finance/FinancialTransfersController.php @@ -3,7 +3,7 @@ namespace app\store\controller\finance; -use app\admin\lists\financial_transfers\FinancialTransfersLists; +use app\store\lists\financial_transfers\FinancialTransfersLists; use app\admin\logic\financial_transfers\FinancialTransfersLogic; use app\admin\validate\financial_transfers\FinancialTransfersValidate; use app\common\controller\Definitions; @@ -13,7 +13,6 @@ use hg\apidoc\annotation as ApiDoc; #[ApiDoc\title('提现列表')] class FinancialTransfersController extends BaseAdminController { -// public $notNeedLogin = ['confirmation', 'app_update', 'test']; #[ ApiDoc\Title('财务流水'), ApiDoc\url('/store/finance/financialTransfers/lists'), diff --git a/app/store/lists/financial_transfers/FinancialTransfersLists.php b/app/store/lists/financial_transfers/FinancialTransfersLists.php new file mode 100644 index 000000000..7c5f68a21 --- /dev/null +++ b/app/store/lists/financial_transfers/FinancialTransfersLists.php @@ -0,0 +1,65 @@ + [ 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/06/14 10:10 + */ + public function lists(): array + { + $this->searchWhere[] = ['store_id','=',$this->adminInfo['store_id']]; + return FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author admin + * @date 2024/06/14 10:10 + */ + public function count(): int + { + return FinancialTransfers::where($this->searchWhere)->count(); + } + +} \ No newline at end of file From 5de9a7f264bbb03428be726099c7b0af2a39b05a Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Fri, 14 Jun 2024 16:37:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancialTransfersLists.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/admin/lists/financial_transfers/FinancialTransfersLists.php b/app/admin/lists/financial_transfers/FinancialTransfersLists.php index a9a3b9a0a..8c989e285 100644 --- a/app/admin/lists/financial_transfers/FinancialTransfersLists.php +++ b/app/admin/lists/financial_transfers/FinancialTransfersLists.php @@ -26,7 +26,8 @@ class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['store_id', 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time'], + '=' => ['store_id', 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time','create_time'], + 'between_time' => 'create_time', ]; } @@ -42,12 +43,23 @@ class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchI */ public function lists(): array { - return FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere) -// ->field(['id', 'store_id', 'admin_id', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time']) + $data = FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() ->toArray(); + foreach ($data as &$value){ + if($value['initiation_time']){ + $value['initiation_time'] = date('Y-m-d H:i:s',$value['initiation_time']); + } + + if($value['confirmation_time']){ + $value['confirmation_time'] = date('Y-m-d H:i:s',$value['confirmation_time']); + + } + + } + return $data; } From b18561b28cd01e11cdde731fb9b742af7b5c607d Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Fri, 14 Jun 2024 16:39:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/finance/FinancialTransfersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/store/controller/finance/FinancialTransfersController.php b/app/store/controller/finance/FinancialTransfersController.php index af30a569c..0f103d94f 100644 --- a/app/store/controller/finance/FinancialTransfersController.php +++ b/app/store/controller/finance/FinancialTransfersController.php @@ -62,7 +62,7 @@ class FinancialTransfersController extends BaseAdminController $result = FinancialTransfersLogic::dealchange($data,$params['id']); if (true === $result) { - return $this->success('操作成功' ); + return $this->success('操作成功',[],1,1 ); } return $this->fail(FinancialTransfersLogic::getError());