增加了两个接口： 获取所有门店列表，切换门店

app/ghs/controllers/ShopController.php

@@ -3,6 +3,7 @@
 namespace ghs\controllers;
 
 use biz\merchant\services\MerchantExtendService;
+use bizGhs\admin\classes\AdminClass;
 use bizGhs\merchant\classes\ShopClass;
 use bizGhs\merchant\services\ShopService;
 use common\components\dirUtil;
@@ -10,10 +11,11 @@ use common\components\httpUtil;
 use common\components\util;
 use common\components\wxUtil;
 use Yii;
+use yii\web\UrlManager;
 
 class ShopController extends BaseController
 {
-	
+
 	//门店列表 shish 2021.1.14
 	public function actionList()
 	{
@@ -23,7 +25,7 @@ class ShopController extends BaseController
 		$list = ShopClass::getShopList($where);
 		util::success($list);
 	}
-	
+
 	//更新门店 shish 2020.2.29
 	public function actionUpdate()
 	{
@@ -38,7 +40,7 @@ class ShopController extends BaseController
 		ShopClass::updateShop($id, $data);
 		util::complete();
 	}
-	
+
 	//添加门店 shish 2021.1.14
 	public function actionAdd()
 	{
@@ -47,7 +49,7 @@ class ShopController extends BaseController
 		ShopClass::addShop($data);
 		util::complete();
 	}
-	
+
 	//PC下载微信和支付宝收款码 shish 2020.2.29
 	public function actionGatheringCode()
 	{
@@ -71,7 +73,7 @@ class ShopController extends BaseController
 		header("Content-Disposition: attachment; filename=" . urldecode($fileName)); //设置要下载文件的文件名
 		readfile($file);
 	}
-	
+
 	//PC获取小程序的收款码 shish
 	public function actionGatheringMiniCode()
 	{
@@ -99,7 +101,7 @@ class ShopController extends BaseController
 		header("Content-Disposition: attachment; filename=" . urldecode($fileName)); //设置要下载文件的文件名
 		readfile($file);
 	}
-	
+
 	//PC下载会员注册码 shish 2020.2.29
 	public function actionApplyMemberCode()
 	{
@@ -127,7 +129,7 @@ class ShopController extends BaseController
 		header("Content-Disposition: attachment; filename=" . urldecode($fileName)); //设置要下载文件的文件名
 		readfile($file);
 	}
-	
+
 	//删除门店 shish 2020.3.1
 	public function actionDelete()
 	{
@@ -137,5 +139,34 @@ class ShopController extends BaseController
 		ShopClass::deleteShop($shop);
 		util::complete();
 	}
-	
-}
+
+	//获取所有门店linqh 2021.1.31
+    public function actionAll()
+    {
+        $res = [];
+        //adminId 为 super 才有权限看到所有的门店
+        if($this->adminId['super']==1){
+            $res = ShopClass::getAllShop($this->sjId,$filed = 'id,shopName,avatar');
+        }
+        util::success($res);
+    }
+
+    //切换门店 linqh 2021.1.31
+    public function actionToggleShop()
+    {
+        $shopId = Yii::$app->request->post('shopId',0);
+        if(!$shopId){
+            util::fail();
+        }
+        if($this->adminId['super']!=1){
+            util::fail("权限不够");
+        }
+        //修改
+        $res = AdminClass::toggleShop($this->adminId,$shopId);
+        if($res){
+            util::complete("切换成功");
+        }
+        util::fail();
+    }
+
+}

biz-ghs/admin/classes/AdminClass.php

@@ -43,7 +43,7 @@ class AdminClass extends BaseClass
 		}
 		return $list;
 	}
-	
+
 	//取单个员工详情 shish 2019.12.9
 	public static function getAdminById($id)
 	{
@@ -54,7 +54,7 @@ class AdminClass extends BaseClass
 		$list = self::groupAdminBaseInfo([$detail]);
 		return current($list);
 	}
-	
+
 	//取多个员工信息 shish 2021.1.19
 	public static function getAdminByIds($ids)
 	{
@@ -65,17 +65,17 @@ class AdminClass extends BaseClass
 		$adminList = self::groupAdminBaseInfo($adminList);
 		return $adminList;
 	}
-	
+
 	//添加员工 shish 2019.12.9
 	public static function addAdmin($data)
 	{
 		$merchantId = $data['merchantId'];
-		
+
 		//验证角色
 		$roleId = $data['roleId'];
 		$role = AdminRoleClass::getById($roleId);
 		AdminRoleClass::valid($role, $merchantId);
-		
+
 		//验证关联的微信
 		$adminId = $data['admin'];
 		$admin = self::getById($adminId);
@@ -86,27 +86,27 @@ class AdminClass extends BaseClass
 		$respond = self::add($data);
 		return $respond;
 	}
-	
+
 	//获取商家的所有员工 shish 2019.12.9
 	public static function getAdminList($merchantId)
 	{
 		return self::getAllByCondition(['merchantId' => $merchantId, 'delStatus' => 0, 'status' => 1], null, '*');
 	}
-	
+
 	//获取商家所有员工的名字 shish 2019.12.9
 	public static function getAdminNameList($merchantId)
 	{
 		$list = self::getAdminList($merchantId);
 		return !empty($list) ? array_column($list, 'adminName') : [];
 	}
-	
+
 	//获取商家所有员工已经关联微信的userId
 	public static function getShopAdminUserId($merchantId)
 	{
 		$list = self::getAdminList($merchantId);
 		return !empty($list) ? array_column($list, 'userId') : [];
 	}
-	
+
 	//验证权限
 	public static function valid($admin, $merchantId)
 	{
@@ -119,7 +119,7 @@ class AdminClass extends BaseClass
 			util::fail('您没有权限操作');
 		}
 	}
-	
+
 	//删除员工，需要考虑权限 shish 2019.12.9
 	public static function deleteAdmin($admin, $adminId)
 	{
@@ -132,17 +132,17 @@ class AdminClass extends BaseClass
 		}
 		self::updateById($id, ['delStatus' => 1]);
 	}
-	
+
 	public static function getByMiniOpenId($miniOpenId)
 	{
 		return self::getByCondition(['miniOpenId' => $miniOpenId]);
 	}
-	
+
 	public static function getByUnionId($unionId)
 	{
 		return self::getByCondition(['unionId' => $unionId]);
 	}
-	
+
 	//创建以及更新用户 shish 2020.2.7
 	public static function replaceAdmin($adminInfo, $source)
 	{
@@ -190,7 +190,7 @@ class AdminClass extends BaseClass
 		}
 		return $admin;
 	}
-	
+
 	//更新员工信息 shish 2020.5.30
 	public static function updateAdmin($originalAdmin, $getAdminInfo)
 	{
@@ -229,7 +229,7 @@ class AdminClass extends BaseClass
 		if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
 			$data['isFull'] = 1;
 		}
-		
+
 		//更新头像
 		$merchantId = 0;
 		if (isset($originalAdmin['avatar']) == false || empty($originalAdmin['avatar'])) {
@@ -241,12 +241,12 @@ class AdminClass extends BaseClass
 				}
 			}
 		}
-		
+
 		self::updateById($adminId, $data);
 		$admin = self::getById($adminId);
 		return $admin;
 	}
-	
+
 	public static function generateAdmin($getAdminInfo)
 	{
 		$time = time();
@@ -263,7 +263,7 @@ class AdminClass extends BaseClass
 		$getAdminInfo['addTime'] = $time;
 		$getAdminInfo['source'] = isset($getAdminInfo['source']) ? $getAdminInfo['source'] : 0;
 		$getAdminInfo['hasSubscribe'] = 0;
-		
+
 		if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
 			$imgUrl = $getAdminInfo['headImgUrl'];
 			$name = ImageService::generateAvatar(0, $imgUrl);
@@ -271,7 +271,7 @@ class AdminClass extends BaseClass
 				$getAdminInfo['avatar'] = $name;
 			}
 		}
-		
+
 		$admin = self::add($getAdminInfo);
 		$adminId = $admin['id'];
 		if (empty($nickName)) {
@@ -279,36 +279,36 @@ class AdminClass extends BaseClass
 		}
 		return $admin;
 	}
-	
+
 	//合并管理员
 	public static function mergeAdmin($delAdmin, $retainAdmin)
 	{
 		$connection = Yii::$app->db;//事务处理
 		$transaction = $connection->beginTransaction();
 		try {
-			
+
 			$delAdminId = $delAdmin['id'];
 			$clearData = ['openId' => '', 'miniOpenId' => '', 'unionId' => ''];
 			self::updateById($delAdminId, $clearData);
-			
+
 			$transaction->commit();
 		} catch (Exception $e) {
 			$transaction->rollBack();
 			return [];
 		}
 	}
-	
+
 	//找出相同unionId的用户
 	public static function getSameUnionId($unionId)
 	{
 		return self::getAllByCondition(['unionId' => $unionId], 'addTime desc', '*');
 	}
-	
+
 	public static function getByOpenId($openId)
 	{
 		return self::getByCondition(['openId' => $openId]);
 	}
-	
+
 	//将微信和小程序获取的用户信息转成可以保存的用户信息
 	public static function switchAdminInfo($info, $source)
 	{
@@ -356,11 +356,17 @@ class AdminClass extends BaseClass
 		}
 		return $info;
 	}
-	
+
 	//取消关注 shish 2020.4.19
 	public static function unFocus($adminId)
 	{
 		self::updateById($adminId, ['subscribe' => 0, 'hasSubscribe' => 1]);
 	}
-	
-}
+
+	//切换门店 linqh 2021.1.31
+    public static function toggleShop($adminId,$shopId)
+    {
+        return self::updateById($adminId,['currentShopId'=>$shopId]);
+    }
+
+}

biz-ghs/merchant/classes/ShopClass.php

@@ -12,21 +12,21 @@ use biz\base\classes\BaseClass;
 
 class ShopClass extends BaseClass
 {
-	
+
 	public static $baseFile = '\bizGhs\merchant\models\Shop';
-	
+
 	public static function getShopList($where)
 	{
 		$list = self::getList('*', $where, 'addTime DESC');
 		return $list;
 	}
-	
+
 	//获取商家默认的门店ID shish 2020.1.19
 	public static function getDefaultShopId($merchant)
 	{
 		return isset($merchant['defaultShopId']) ? $merchant['defaultShopId'] : 0;
 	}
-	
+
 	//创建门店 shish 2021.1.14
 	public static function addShop($data)
 	{
@@ -42,7 +42,7 @@ class ShopClass extends BaseClass
 		$shop = self::add($data);
 		return $shop;
 	}
-	
+
 	//更新门店 shish 2020.2.29
 	public static function updateShop($id, $data)
 	{
@@ -54,13 +54,13 @@ class ShopClass extends BaseClass
 		}
 		return self::updateById($id, $data);
 	}
-	
+
 	//取商家所有门店 shish 2020.2.29
-	public static function getAllShop($merchantId)
+	public static function getAllShop($merchantId,$filed="",$order=null)
 	{
-		return self::getAllByCondition(['merchantId' => $merchantId]);
+		return self::getAllByCondition(['merchantId' => $merchantId],$order,$filed);
 	}
-	
+
 	//验证权限 shish 2021.1.14
 	public static function valid($shop, $merchantId)
 	{
@@ -69,7 +69,7 @@ class ShopClass extends BaseClass
 		}
 		util::fail('您没有权限访问此店铺');
 	}
-	
+
 	//删除门店 shish 2020.3.1
 	public static function deleteShop($shop)
 	{
@@ -79,7 +79,7 @@ class ShopClass extends BaseClass
 		$id = $shop['id'];
 		self::updateById($id, ['delStatus' => 1]);
 	}
-	
+
 	//生成收款码 shish 2021.1.14
 	public static function generateGatheringCode($merchantId, $shopId)
 	{
@@ -89,5 +89,5 @@ class ShopClass extends BaseClass
 		$gatheringCode = qrCodeUtil::generateGatheringQrCode($url, $merchantId, $shopId, '', 10);
 		return $gatheringCode;
 	}
-	
-}
+
+}