From 5e7400560c2e1fa4cbaff14b09564de5493c001e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 27 Dec 2023 15:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=8B=9B=E5=95=86=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/system/merchant/Merchant.php              | 4 ++++
 .../repositories/system/merchant/MerchantRepository.php    | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/common/model/system/merchant/Merchant.php b/app/common/model/system/merchant/Merchant.php
index 5517214..db46fc4 100644
--- a/app/common/model/system/merchant/Merchant.php
+++ b/app/common/model/system/merchant/Merchant.php
@@ -17,6 +17,7 @@ use app\common\model\store\service\StoreService;
 use app\common\model\system\config\SystemConfigValue;
 use app\common\model\system\financial\Financial;
 use app\common\model\system\serve\ServeOrder;
+use app\common\model\user\User;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\StoreActivityRepository;
 
@@ -283,6 +284,9 @@ class Merchant extends BaseModel
         return (int)$monthOrderCount;
     }
 
+    public function spread(){
+        return $this->hasOne(User::class,'uid','spread_uid');
+    }
 
 
 
diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 8723bcb..2a56684 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -83,10 +83,15 @@ class MerchantRepository extends BaseRepository
                 'admin' => function ($query) {
                     $query->field('mer_id,account');
                 },
+                'spread' => function ($query) {
+                    $query->field('uid,nickname,avatar');
+                },
                 'merchantCategory',
                 'merchantType'
             ])
-            ->field('sort,mer_id,mer_name,real_name,mer_phone,mer_address,mark,status,create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,ot_margin,mer_avatar,margin_remind_time')->select();
+            ->field('uid,spread_uid,sort,mer_id,mer_name,real_name,mer_phone,mer_address,mark,status,create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,ot_margin,mer_avatar,margin_remind_time')
+            ->select();
+
         return compact('count', 'list');
     }