From a61a729ae3a996e629c6f3299115a12e21ed150b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 29 May 2023 16:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/FinancialRecord.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/system/merchant/FinancialRecord.php b/app/controller/admin/system/merchant/FinancialRecord.php
index 05e556dc..0fd5e30d 100644
--- a/app/controller/admin/system/merchant/FinancialRecord.php
+++ b/app/controller/admin/system/merchant/FinancialRecord.php
@@ -38,10 +38,13 @@ class FinancialRecord extends BaseController
         if ($merId) {
             $where['mer_id'] = $merId;
             $where['financial_type'] = ['order', 'mer_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon',
-                'order_svip_coupon','commission_to_service_team','commission_to_service_team_refun','commission_to_platform','commission_to_platform_refun','commission_to_village','commission_to_village_refun','commission_to_town','commission_to_town_refun'];
+                'order_svip_coupon','commission_to_service_team','commission_to_service_team_refund','commission_to_platform','commission_to_platform_refund','commission_to_village','commission_to_village_refund','commission_to_town','commission_to_town_refund','commission_to_entry_merchant','commission_to_entry_merchant_refund'
+                    ,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund'];
         } else {
             $where['financial_type'] = ['order', 'sys_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon',
-                'order_svip_coupon','commission_to_service_team','commission_to_service_team_refun','commission_to_platform','commission_to_platform_refun','commission_to_village','commission_to_village_refun','commission_to_town','commission_to_town_refun'];
+                'order_svip_coupon','commission_to_service_team','commission_to_service_team_refund','commission_to_platform','commission_to_platform_refund','commission_to_village','commission_to_village_refund','commission_to_town','commission_to_town_refund'
+                    ,'commission_to_entry_merchant','commission_to_entry_merchant_refund'
+                    ,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund'];
         }
         return app('json')->success($this->repository->getList($where, $page, $limit));
     }