From 7afb656dfa6294a01652aba01b367327a8461107 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 7 May 2024 11:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0=E5=95=86?=
 =?UTF-8?q?=E9=93=BA=E6=98=AF=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/merchat/MerchantLists.php       | 4 ++--
 app/admin/logic/merchat/MerchantLogic.php       | 2 ++
 app/admin/validate/merchat/MerchantValidate.php | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/admin/lists/merchat/MerchantLists.php b/app/admin/lists/merchat/MerchantLists.php
index 9b5425a..d1b16a9 100644
--- a/app/admin/lists/merchat/MerchantLists.php
+++ b/app/admin/lists/merchat/MerchantLists.php
@@ -26,7 +26,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['category_id', 'type_id', 'mer_name', 'credit_buy', 'status', 'commission_rate', 'service_phone', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'],
+            '=' => ['category_id', 'type_id', 'mer_name', 'credit_buy', 'status', 'commission_rate', 'service_phone','service_user', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'],
         ];
     }
 
@@ -43,7 +43,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return Merchant::where($this->searchWhere)
-            ->field(['mer_id', 'category_id', 'type_id', 'mer_name', 'credit_buy', 'settle_cycle', 'interest_rate', 'city_id', 'area_id', 'street_id', 'village_id', 'mer_address', 'mer_avatar', 'mark', 'commission_rate', 'service_phone', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'])
+            ->field(['mer_id', 'category_id', 'type_id', 'mer_name', 'credit_buy', 'settle_cycle', 'interest_rate', 'city_id', 'area_id', 'street_id', 'village_id', 'mer_address', 'mer_avatar', 'mark', 'commission_rate', 'service_phone','service_user', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['mer_id' => 'desc'])
             ->select()
diff --git a/app/admin/logic/merchat/MerchantLogic.php b/app/admin/logic/merchat/MerchantLogic.php
index da09c35..56e2f8b 100644
--- a/app/admin/logic/merchat/MerchantLogic.php
+++ b/app/admin/logic/merchat/MerchantLogic.php
@@ -50,6 +50,7 @@ class MerchantLogic extends BaseLogic
                 'long' => $params['long'],
                 'lat' => $params['lat'],
                 'service_phone' => $params['service_phone'],
+                'service_user' => $params['service_user'],
                 'mer_money' => $params['mer_money'],
                 'financial_bank' => $params['financial_bank'],
                 'financial_wechat' => $params['financial_wechat'],
@@ -99,6 +100,7 @@ class MerchantLogic extends BaseLogic
                 'long' => $params['long'],
                 'lat' => $params['lat'],
                 'service_phone' => $params['service_phone'],
+	            'service_user' => $params['service_user'],
                 'mer_money' => $params['mer_money'],
                 'financial_bank' => $params['financial_bank'],
                 'financial_wechat' => $params['financial_wechat'],
diff --git a/app/admin/validate/merchat/MerchantValidate.php b/app/admin/validate/merchat/MerchantValidate.php
index cc1cdd1..15c62ae 100644
--- a/app/admin/validate/merchat/MerchantValidate.php
+++ b/app/admin/validate/merchat/MerchantValidate.php
@@ -30,6 +30,7 @@ class MerchantValidate extends BaseValidate
         'sort' => 'require',
         'status' => 'require',
         'service_phone' => 'require',
+        'service_user' => 'require',
         'mer_money' => 'require',
     ];
 
@@ -50,6 +51,7 @@ class MerchantValidate extends BaseValidate
         'sort' => 'sort',
         'status' => '商户是否禁用0锁定,1正常',
         'service_phone' => '店铺电话',
+        'service_user' => '店主姓名',
         'mer_money' => '商户余额',
     ];
 
@@ -62,7 +64,7 @@ class MerchantValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','mer_money']);
+        return $this->only(['category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','service_user','mer_money']);
     }
 
 
@@ -74,7 +76,7 @@ class MerchantValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['mer_id','category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','mer_money']);
+        return $this->only(['mer_id','category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','service_user','mer_money']);
     }