From c4b821d3ea1869a55b9a71564e9f7e0c7868bdf0 Mon Sep 17 00:00:00 2001
From: codeliu <1873441552@qq.com>
Date: Sat, 23 Mar 2024 14:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index ae064bb5..b6c78d20 100644
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -143,14 +143,13 @@ class MerchantIntentionRepository extends BaseRepository
      * @return void
      * @throws \think\db\exception\DbException
      */
-    public function updateIdent($id, $data,$admin_id)
+    public function updateIdent($id, $data)
     {
         //通过就 更改商户的身份
         $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 60a11367..87817049 100644
--- a/app/controller/admin/system/merchant/MerchantIntention.php
+++ b/app/controller/admin/system/merchant/MerchantIntention.php
@@ -92,10 +92,10 @@ class MerchantIntention extends BaseController
     {
         if (!$this->repository->getWhereCount(['mer_intention_id' => $id, 'is_del' => 0]))
             return app('json')->fail('数据不存在');
-        $data = $this->request->params(['status','fail_msg']);
+        $data = $this->request->params(['status','fail_msg','admin_id']);
         if(empty($data['status']))   return app('json')->fail('缺失参数');
-        $adminid = $request->adminId();
-        $this->repository->updateIdent($id, $data,$adminid);
+
+        $this->repository->updateIdent($id, $data);
         return app('json')->success('审核通过');
     }