From c2921e165dfae76c15c5e7a6cdd16699cc43cfd7 Mon Sep 17 00:00:00 2001
From: codeliu <1873441552@qq.com>
Date: Sat, 23 Mar 2024 14:30:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantIntentionRepository.php          | 5 +++--
 app/controller/admin/system/merchant/MerchantIntention.php   | 4 ++--
 app/controller/api/store/merchant/MerchantIntention.php      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index b6c78d20..e3db6009 100644
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -61,7 +61,7 @@ class MerchantIntentionRepository extends BaseRepository
         foreach ($list as $k=> &$value){
             if ($value['admin_id']) {
                 $checkInfo = Admin::getDB()->where('admin_id',$value['admin_id'])->find();
-                $value['check_name'] = $checkInfo['real_name'];
+                $value['check_name'] = $checkInfo['account'];
                 $value['check_phone'] = $checkInfo['phone'];
             }else{
                 $value['check_name'] = '';
@@ -143,13 +143,14 @@ class MerchantIntentionRepository extends BaseRepository
      * @return void
      * @throws \think\db\exception\DbException
      */
-    public function updateIdent($id, $data)
+    public function updateIdent($id, $data,$admin_id)
     {
         //通过就 更改商户的身份
         $intention = $this->search(['mer_intention_id' => $id])->find();
         if (!$intention)
             throw new ValidateException('信息不存在');
         $uid = $intention->uid;
+        $intention->admin_id = $admin_id;
         if($data['status'] == 1){
             $check = Merchant::getDB()->where('uid', $uid)->value('mer_id');//商户
 
diff --git a/app/controller/admin/system/merchant/MerchantIntention.php b/app/controller/admin/system/merchant/MerchantIntention.php
index 87817049..3041ccc6 100644
--- a/app/controller/admin/system/merchant/MerchantIntention.php
+++ b/app/controller/admin/system/merchant/MerchantIntention.php
@@ -94,8 +94,8 @@ class MerchantIntention extends BaseController
             return app('json')->fail('数据不存在');
         $data = $this->request->params(['status','fail_msg','admin_id']);
         if(empty($data['status']))   return app('json')->fail('缺失参数');
-
-        $this->repository->updateIdent($id, $data);
+        $adminid = $request->adminId();
+        $this->repository->updateIdent($id, $data,$adminid);
         return app('json')->success('审核通过');
     }
 
diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 6a2aa2a6..f61e7f35 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -367,7 +367,7 @@ class MerchantIntention extends BaseController
 
             if ($v['admin_id']) {
                 $checkInfo = Admin::getDB()->where('admin_id',$v['admin_id'])->find();
-                $v['check_name'] = $checkInfo['real_name'];
+                $v['check_name'] = $checkInfo['account'];
                 $v['check_phone'] = $checkInfo['phone'];
             }else{
                 $v['check_name'] = '';