所有门店判断

app-ghs/controllers/ShopController.php

@@ -145,8 +145,8 @@ class ShopController extends BaseController
     public function actionAll()
     {
         $res = [];
-        //adminId 为 super 才有权限看到所有的门店
-        if ($this->admin['super'] == 1) {
+        $shopAdmin = $this->shopAdmin;
+        if ($shopAdmin['super'] == 1) {
             $res = ShopClass::getAllShop($this->sjId);
         }
         util::success($res);

app-hd/controllers/AuthController.php

@@ -200,7 +200,6 @@ class AuthController extends PublicController
         //用户来源
         $userSource = UserClass::$userSourceId['mini']['name'];
         $admin = AdminService::getByMiniOpenId($openid);
-        $shopId = 0;
         if (empty($admin)) {
             $adminInfo = ['miniOpenId' => $openid];
             $admin = AdminService::replaceAdmin($adminInfo, $userSource);

app-hd/controllers/ShopController.php

@@ -9,13 +9,6 @@ use common\components\dirUtil;
 use common\components\util;
 use common\components\wxUtil;
 use Yii;
-use bizHd\ad\services\AdService;
-use bizHd\goods\services\CategoryService;
-use bizHd\goods\services\GoodsCategoryService;
-use bizHd\invite\services\InviteService;
-use biz\sj\services\MerchantService;
-use bizHd\user\services\UserService;
-use yii\web\Controller;
 
 class ShopController extends BaseController
 {
@@ -181,4 +174,15 @@ class ShopController extends BaseController
         util::complete();
     }
 
+    //获取所有门店linqh 2021.1.31
+    public function actionAll()
+    {
+        $res = [];
+        $shopAdmin = $this->shopAdmin;
+        if ($shopAdmin['super'] == 1) {
+            $res = ShopClass::getAllShop($this->sjId);
+        }
+        util::success($res);
+    }
+
 }