From eff3a9a2c6c084258cd6d6ed2f4ca70052c7db68 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 27 Jun 2024 15:13:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(StoreFinanceFlow):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=B5=81=E6=B0=B4=E7=9A=84=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=8C=89=E5=B9=B4=E4=BB=BD=E5=92=8C?=
 =?UTF-8?q?=E6=9C=88=E4=BB=BD=E6=88=96=E6=8C=89=E5=91=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=92=8C=E6=94=AF=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/store_finance_flow/StoreFinanceFlowMonthLists.php     | 2 +-
 .../lists/store_finance_flow/StoreFinanceFlowWeekLists.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php
index c91be7381..3ee82eb3c 100644
--- a/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php
+++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php
@@ -46,7 +46,7 @@ class StoreFinanceFlowMonthLists extends BaseAdminDataLists implements ListsSear
         return StoreFinanceFlow::where($this->searchWhere)
             ->field('
             CONCAT(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), "年", MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), "月") as date,
-                SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income,
+                SUM(CASE WHEN financial_pm = 1 AND financial_type = 1 THEN number ELSE 0 END) as income,
                 SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as expenditure
             ')
             ->limit($this->limitOffset, $this->limitLength)
diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php
index 00513e499..41c2386dc 100644
--- a/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php
+++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php
@@ -46,7 +46,7 @@ class StoreFinanceFlowWeekLists extends BaseAdminDataLists implements ListsSearc
         return StoreFinanceFlow::where($this->searchWhere)
             ->field('
             CONCAT("第", LPAD(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 4, "0"), "-", LPAD(WEEK(FROM_UNIXTIME(create_time, "%Y-%m-%d"), 3), 2, "0"), "周(", LPAD(MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 2, "0"), "月)") as date,
-                SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income,
+                SUM(CASE WHEN financial_pm = 1 AND financial_type = 1 THEN number ELSE 0 END) as income,
                 SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as expenditure
             ')
             ->limit($this->limitOffset, $this->limitLength)