From 97e31c2bf3ce5ae8d895c9a9b87ae419ec61efcf Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 30 Mar 2024 10:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=B8=8D=E6=98=AF=E5=95=86=E6=88=B7=E8=B6=85?=
 =?UTF-8?q?=E7=AE=A1=E6=97=B6=20=E8=BF=9B=E8=A1=8C=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8F=AF=E8=83=BD=E6=8A=A5=E9=94=99=20-=20?=
 =?UTF-8?q?=E6=97=A0=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../middleware/MerchantServerMiddleware.php   |  6 +++++-
 .../store/service/StoreServiceRepository.php  | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/common/middleware/MerchantServerMiddleware.php b/app/common/middleware/MerchantServerMiddleware.php
index 3d71683..4739e91 100644
--- a/app/common/middleware/MerchantServerMiddleware.php
+++ b/app/common/middleware/MerchantServerMiddleware.php
@@ -34,8 +34,12 @@ class MerchantServerMiddleware extends BaseMiddleware
             $service = app()->make(StoreServiceRepository::class)->getService($userInfo->main_uid, $this->merId);
         }
 
+        if (!$service) {
+            $service = app()->make(StoreServiceRepository::class)->getAdminService($this->merId);
+        }
+
         if (!$service || !$service->$field) {
-            // throw new HttpResponseException(app('json')->fail('您没有权限操作'));
+            throw new HttpResponseException(app('json')->fail('您没有权限操作'));
         }
         $request->macro('serviceInfo', function () use (&$service) {
             return $service;
diff --git a/app/common/repositories/store/service/StoreServiceRepository.php b/app/common/repositories/store/service/StoreServiceRepository.php
index 668dc91..9ea1d5c 100644
--- a/app/common/repositories/store/service/StoreServiceRepository.php
+++ b/app/common/repositories/store/service/StoreServiceRepository.php
@@ -419,7 +419,22 @@ class StoreServiceRepository extends BaseRepository
 
         return $this->dao->delete($id);
     }
-
-
+    /**
+     * Common: 获取当前商户超管
+     * Author: wu-hui
+     * Time: 2024/03/30 9:56
+     * @param int $merId
+     * @return array|\think\Model
+     */
+    public function getAdminService(int $merId){
+        return $this->dao->getSearch([])
+            ->hasWhere('merchant',function($query){
+                $query->where('is_del', 0);
+            })
+            ->where('StoreService.mer_id',$merId)
+            ->where('StoreService.is_del', 0)
+            ->where('StoreService.is_manage', 1)
+            ->findOrEmpty();
+    }
 
 }