From 83dc234e26ed768bba339937423c5c0c487b500d Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 21 Apr 2024 17:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=83=9F=E9=85=92?=
 =?UTF-8?q?=E5=BA=97=E3=80=81=E8=B6=85=E5=B8=82=E3=80=81=E7=9C=81=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E9=97=A8=E5=BA=97=E5=9C=A8=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=E8=AF=A5=E7=94=A8=E6=88=B7=E7=9A=84=E5=91=98=E5=B7=A5=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=80=8C=E4=B8=8D=E6=98=AF=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E5=91=98=E5=B7=A5=E8=BA=AB=E4=BB=BD=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E8=AF=A5=E7=94=A8=E6=88=B7=E6=97=A0=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=BA=AB=E4=BB=BD=E6=97=B6=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/StoreServiceRepository.php           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/store/service/StoreServiceRepository.php b/app/common/repositories/store/service/StoreServiceRepository.php
index bf22053..7ef9743 100644
--- a/app/common/repositories/store/service/StoreServiceRepository.php
+++ b/app/common/repositories/store/service/StoreServiceRepository.php
@@ -222,7 +222,7 @@ class StoreServiceRepository extends BaseRepository
                     $query->where('is_del',0);
                 })
                     ->where('StoreService.mer_id',$where['appoint_mer_id'])
-                    ->when($is_sys == 2,function($query){
+                    ->when(in_array($is_sys,[2,3,4,5]),function($query){
                         $query->where('StoreService.is_manage',1);
                     },function($query) use ($uid){
                         $query->where('StoreService.uid',$uid);
@@ -230,11 +230,11 @@ class StoreServiceRepository extends BaseRepository
             },function($query) use ($is_sys, $uid){
                 // 不存在指定商户id
                 $query->hasWhere('merchant',function($query) use ($is_sys){
-                    // 商户类别(merchant_type)：0=普通商户，1=酒道馆，2=供应商，3=烟酒店
-                    // is_sys：0=商户管理，1=平台管理，2=酒道馆管理，3=烟酒店
-                    $merchantType = 0;
+                    // 商户类别(merchant_type)：0=普通商户，1=酒道馆，2=供应商，3=烟酒店，4=超市，5=省公司门店
+                    // is_sys：0=商户管理，1=平台管理，2=酒道馆管理，3=烟酒店，4=超市，5=省公司门店
+                    $merchantType = $is_sys;
                     if($is_sys == 2) $merchantType = 1;
-                    else if($is_sys == 3) $merchantType = 3;
+                    else if($is_sys == 1) $merchantType = 0;
                     $query->where('is_del', 0)->where('merchant_type', $merchantType);
                 })->where('StoreService.mer_id',$is_sys == 1 ? '=' : '>',0)
                     ->where('StoreService.uid',$uid);