From 149d818157726294f193945759381b200e3a67a7 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 19 Jun 2024 16:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store_finance_flow/StoreFinanceFlowLists.php    |  1 +
 .../controller/finance/StoreBillController.php      | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
index 3dedf3c5a..fd996b83b 100644
--- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
+++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
@@ -33,6 +33,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
         return [
             '=' => ['store_id', 'user_id', 'create_time', 'staff_id'],
             'between_time'=>'create_time',
+            '%pipe_like%' => ['keyword'=>'order_sn'],
         ];
     }
 
diff --git a/app/store/controller/finance/StoreBillController.php b/app/store/controller/finance/StoreBillController.php
index 50c7fb34c..cbd7bc6be 100644
--- a/app/store/controller/finance/StoreBillController.php
+++ b/app/store/controller/finance/StoreBillController.php
@@ -2,7 +2,10 @@
 
 namespace app\store\controller\finance;
 
+use app\admin\lists\store_finance_flow\StoreFinanceFlowDayLists;
 use app\admin\lists\store_finance_flow\StoreFinanceFlowLists;
+use app\admin\lists\store_finance_flow\StoreFinanceFlowMonthLists;
+use app\admin\lists\store_finance_flow\StoreFinanceFlowWeekLists;
 use app\common\controller\Definitions;
 use app\common\lists\StoreBillLists;
 use app\store\controller\BaseAdminController;
@@ -27,7 +30,15 @@ class StoreBillController extends BaseAdminController
     // ]
     public function lists()
     {
-        return $this->dataLists(new StoreBillLists());
+        $type = $this->request->get('type');
+        if($type == 1){
+            return $this->dataLists(new StoreFinanceFlowDayLists());
+        }else if($type == 2){
+            return $this->dataLists(new StoreFinanceFlowWeekLists());
+        }else{
+            return $this->dataLists(new StoreFinanceFlowMonthLists());
+        }
+//        return $this->dataLists(new StoreBillLists());
     }
 
     // #[