From 48a54fcf5ad78c5f46c3d66a12573522047b9801 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 6 Jun 2024 11:10:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(store=5Fcash=5Ffinance=5Fflow):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StoreCashFinanceFlowController.php             | 14 +++++++-------
 .../StoreCashFinanceFlowLists.php                  |  3 ++-
 app/admin/lists/store_order/StoreOrderLists.php    |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php b/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php
index fc010cfab..e8622e7a4 100644
--- a/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php
+++ b/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php
@@ -38,12 +38,12 @@ class StoreCashFinanceFlowController extends BaseAdminController
      */
     public function add()
     {
-        $params = (new StoreCashFinanceFlowValidate())->post()->goCheck('add');
-        $result = StoreCashFinanceFlowLogic::add($params);
-        if (true === $result) {
+        // $params = (new StoreCashFinanceFlowValidate())->post()->goCheck('add');
+        // $result = StoreCashFinanceFlowLogic::add($params);
+        // if (true === $result) {
             return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(StoreCashFinanceFlowLogic::getError());
+        // }
+        // return $this->fail(StoreCashFinanceFlowLogic::getError());
     }
 
 
@@ -72,8 +72,8 @@ class StoreCashFinanceFlowController extends BaseAdminController
      */
     public function delete()
     {
-        $params = (new StoreCashFinanceFlowValidate())->post()->goCheck('delete');
-        StoreCashFinanceFlowLogic::delete($params);
+        // $params = (new StoreCashFinanceFlowValidate())->post()->goCheck('delete');
+        // StoreCashFinanceFlowLogic::delete($params);
         return $this->success('删除成功', [], 1, 1);
     }
 
diff --git a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
index 8caa4c2a9..14f462acb 100644
--- a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
+++ b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
@@ -26,7 +26,8 @@ class StoreCashFinanceFlowLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['store_id', 'create_time'],
+            '=' => ['store_id'],
+            "between_time" => 'create_time'
         ];
     }
 
diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php
index 99c6f2ecd..167f2dbf9 100644
--- a/app/admin/lists/store_order/StoreOrderLists.php
+++ b/app/admin/lists/store_order/StoreOrderLists.php
@@ -65,7 +65,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
             ->select()->each(function ($item) {
                 $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
                 $item['status_name'] = OrderEnum::getOrderType($item['status']) ?? '';
-                for($i=0;$i<3;$i++){
+                for($i=0;$i<count($item['product'])&&$i<3;$i++){
                     $find= StoreBranchProduct::where('id',$item['product'][$i]['product_id'])->field('store_name,image')->find();
                     $item['product'][$i]['store_name']=$find['store_name'];
                     $item['product'][$i]['image']=$find['image'];