From db870ba53e08a02fcb8b53a0875ede1dded157ec Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 20 Mar 2024 12:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=B3=E8=AF=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 9aac3b8c..fccaca7d 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -311,14 +311,14 @@ class MerchantIntention extends BaseController
     public function changeIdentity()
     {
         $data = $this->request->params([
-            'type',
+            'type','mer_id'
         ]);
         if(empty($data['type'])){
             return app('json')->fail('参数缺失请检查');
         }
-        if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
-        $merchantInfo = Merchant::getDB()->where('uid',$this->userInfo->uid)->find();
+        $merchantInfo = Merchant::getDB()->where('mer_id',$data['mer_id'])->find();
         if(empty($merchantInfo)) return app('json')->fail('没有该商户');
+        $data['uid'] = $merchantInfo->uid;
         $data['phone'] = $merchantInfo->mer_phone;
         $data['mer_name'] = $merchantInfo->mer_name;
         $data['name'] = $merchantInfo->real_name;