From a7aab6174b366dae0bf70f99294df1898155a89b Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 12 Jul 2024 13:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E6=88=90?=
 =?UTF-8?q?=E4=B8=BA=E5=95=86=E6=88=B7=E5=91=98=E5=B7=A5=E6=97=B6=20?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=95=86=E6=88=B7=E7=B1=BB=E5=88=AB=20=20?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E7=B1=BB=E5=88=AB=E5=8F=AA=E8=83=BD=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=80=E4=B8=AA=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/StoreServiceRepository.php       | 14 +++++++-------
 .../merchant/MerchantIntentionRepository.php       | 14 +++++++++-----
 .../api/store/merchant/MerchantIntention.php       |  6 +++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/common/repositories/store/service/StoreServiceRepository.php b/app/common/repositories/store/service/StoreServiceRepository.php
index adfc7f5..0c0e667 100644
--- a/app/common/repositories/store/service/StoreServiceRepository.php
+++ b/app/common/repositories/store/service/StoreServiceRepository.php
@@ -350,20 +350,20 @@ class StoreServiceRepository extends BaseRepository
         Cache::set('ser_captcha' . $key, $code, Config::get('admin.captcha_exp', 5) * 60);
         return $key;
     }
-
     /**
      * Common: 判断：指定用户是否为有效员工
      * Author: wu-hui
      * Time: 2024/01/22 11:35
-     * @param int $uid
-     * @param int $id
-     * @param int $merId
+     * @param int    $uid
+     * @param int    $id
+     * @param int    $merId
+     * @param string $merchantType
      * @return bool
      */
-    public function isService(int $uid,int $id = 0,int $merId = 0):bool{
+    public function isService(int $uid,int $id = 0,int $merId = 0, $merchantType = 0):bool{
         $count = $this->dao->getSearch([])
-            ->hasWhere('merchant',function($query){
-                $query->where('is_del', 0)->where('merchant_type', 0);
+            ->hasWhere('merchant',function($query) use ($merchantType){
+                $query->where('is_del', 0)->where('merchant_type', $merchantType);
             })
             ->where('StoreService.uid',$uid)
             ->where('StoreService.is_del', 0)
diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index 5b7b45f..a057661 100644
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -198,23 +198,27 @@ class MerchantIntentionRepository extends BaseRepository
             $intention->save($data);
         });
     }
-
     /**
      * Common: 判断：指定用户是否存在审核中店铺的管理员信息
      * Author: wu-hui
      * Time: 2024/01/19 15:59
-     * @param int $uid
-     * @param int $id
+     * @param int    $uid
+     * @param int    $id
+     * @param string $merchantType
      * @return bool
      */
-    public function isManage(int $uid,int $id = 0):bool{
+    public function isManage(int $uid,int $id = 0,  $merchantType = ''):bool{
         $count = $this->dao->getSearch([])
             ->where('manage_uid',$uid)
             ->where('status',0)
             ->where('is_del',0)
             ->when($id > 0,function($query) use ($id){
                 $query->where('mer_intention_id','<>',$id);
-            })->count();
+            })
+            ->when(isset($merchantType) && $merchantType !== '',function($query) use ($merchantType){
+                $query->where('merchant_type',$merchantType);
+            })
+            ->count();
 
         return $count > 0;
     }
diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 052d3b9..9b729c8 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -148,20 +148,20 @@ class MerchantIntention extends BaseController
      * @return mixed
      */
     public function manageIsEligible(){
-        $data = $this->request->params(['service_id', 'mer_intention_id' ,'manage_uid']);
+        $data = $this->request->params(['service_id', 'mer_intention_id' , 'manage_uid', 'merchant_type']);
         $returnData = [
             'is_eligible' => true,
             'msg' => '有效'
         ];
         // 判断：当前管理员身份是否有效
-        $isService = app()->make(StoreServiceRepository::class)->isService((int)$data['manage_uid'], (int)$data['service_id'], 1);// 是否存在店员信息
+        $isService = app()->make(StoreServiceRepository::class)->isService((int)$data['manage_uid'], (int)$data['service_id'], 1, $data['merchant_type']);// 是否存在店员信息
         if($isService){
             $returnData = [
                 'is_eligible' => false,
                 'msg' => '管理员身份无效，已成为其他商户管理员或店员！'
             ];
         }
-        $isManage = app()->make(repository::class)->isManage((int)$data['manage_uid'], (int)$data['mer_intention_id']);// 是否存在审核中店长信息
+        $isManage = app()->make(repository::class)->isManage((int)$data['manage_uid'], (int)$data['mer_intention_id'], $data['merchant_type']);// 是否存在审核中店长信息
         if($isManage) {
             $returnData = [
                 'is_eligible' => false,