Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

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;
     }
 
 

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'),
@@ -63,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());
 

app/store/lists/financial_transfers/FinancialTransfersLists.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace app\store\lists\financial_transfers;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\financial_transfers\FinancialTransfers;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * FinancialTransfers列表
+ * Class FinancialTransfersLists
+ * @package app\admin\listsfinancial_transfers
+ */
+class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => [ '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();
+    }
+
+}