From 2b600eba59a93205efcdd226b595ad82fffe345e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 19 Apr 2024 17:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=B5=84=E9=87=91?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E4=BF=A1=E6=81=AF=E8=BE=93=E5=87=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=92=8C=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/FinancialRecordDao.php    | 10 +++++-
 .../admin/system/merchant/FinancialRecord.php | 33 ++++++++++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/common/dao/system/merchant/FinancialRecordDao.php b/app/common/dao/system/merchant/FinancialRecordDao.php
index b25bd50..11a0dde 100644
--- a/app/common/dao/system/merchant/FinancialRecordDao.php
+++ b/app/common/dao/system/merchant/FinancialRecordDao.php
@@ -73,7 +73,15 @@ class FinancialRecordDao extends BaseDao
                 }else{
                     $query->where('type','in',[1,2]);
                 }
-            });
+            })
+            ->with([
+                'merchant' => function($query){
+                    $query->field('mer_id,mer_avatar,mer_name');
+                },
+                'user' => function($query){
+                    $query->field('uid,nickname,avatar');
+                }
+            ]);
         return $query;
     }
 
diff --git a/app/controller/admin/system/merchant/FinancialRecord.php b/app/controller/admin/system/merchant/FinancialRecord.php
index e55a3c4..d6dffcc 100644
--- a/app/controller/admin/system/merchant/FinancialRecord.php
+++ b/app/controller/admin/system/merchant/FinancialRecord.php
@@ -27,11 +27,36 @@ class FinancialRecord extends BaseController
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['keyword', 'date', 'mer_id']);
         $merId = $this->request->merId();
-        if ($merId) {
+        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'];
-        } 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'];
+            $where['financial_type'] = [
+                'order',
+                'mer_accoubts',
+                'brokerage_one',
+                'brokerage_two',
+                'refund_brokerage_one',
+                'refund_brokerage_two',
+                'refund_order',
+                'order_platform_coupon',
+                'order_svip_coupon',
+                'province_mer',
+                'supplier_mer'
+            ];
+        }
+        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',
+                'province_mer',
+                'supplier_mer'
+            ];
         }
         return app('json')->success($this->repository->getList($where, $page, $limit));
     }