有关客户与管理员表名调整

app/ghs/controllers/AdminController.php

@@ -13,19 +13,16 @@ use biz\user\classes\UserClass;
 
 class AdminController extends BaseController
 {
-
+	
 	public $guestAccessAction = ['recent-shop'];
-
+	
 	//最近店铺 shish 2021.2.27
 	public function actionRecentShop()
 	{
-		$data = [
-			['shopId' => 2, 'shopName' => '花掌柜', 'shopImg' => Yii::$app->params['imgHost'] . '/hhb_small.png'],
-			['shopId' => 3, 'shopName' => '花和家', 'shopImg' => Yii::$app->params['imgHost'] . '/hhb_small.png'],
-		];
+		$respond = AdminClass::getRecentShop($this->admin);
 		util::success($data);
 	}
-
+	
 	//获取登陆员工的权限 shish 2019.11.24
 	public function actionLoginAuth()
 	{
@@ -124,7 +121,7 @@ class AdminController extends BaseController
 		$detail = AdminService::getDetail($this->adminId);
 		util::success($detail);
 	}
-
+	
 	//小程序用户完整信息 shish 2019.12.12
 	public function actionMiniFullInfo()
 	{
@@ -187,5 +184,5 @@ class AdminController extends BaseController
 		$mobile = isset($arr['purePhoneNumber']) ? $arr['purePhoneNumber'] : '';
 		util::success(['mobile' => $mobile]);
 	}
-
+	
 }

app/ghs/controllers/BaseController.php

@@ -2,6 +2,8 @@
 
 namespace ghs\controllers;
 
+use bizTy\shop\classes\ShopClass;
+use bizTy\sj\classes\MerchantExtendClass;
 use bizTy\sj\services\MerchantExtendService;
 use bizTy\sj\services\MerchantService;
 use bizGhs\merchant\services\ShopService;
@@ -18,7 +20,7 @@ use common\components\util;
 class BaseController extends PublicController
 {
 	public $admin, $adminId, $adminAvatar, $account;
-	public $sjId = 0, $sj, $sjExtend, $signPackage, $shopId = 0;
+	public $sjId = 0, $sj = [], $sjExtend = [], $signPackage, $shopId = 0, $lookShopId = 0;
 	public $appId;
 	public $isWx = false;
 	public $isLogin = false;
@@ -29,10 +31,6 @@ class BaseController extends PublicController
 	{
 		//token验证
 		$adminId = jwt::getLoginId();
-		$sjId = 0;
-		$sj = [];
-		$sjExtend = [];
-		$currentShopId = 0;
 		if (empty($adminId)) {
 			util::notLogin();
 		}
@@ -43,16 +41,17 @@ class BaseController extends PublicController
 		}
 		$this->admin = $admin;
 		$header = httpUtil::getHeader();
-		$shopId = $header['shop-id'] ?? 0;
-		if (!empty($shopId)) {
+		$lookShopId = $header['shop-id'] ?? 0;
+		if (!empty($lookShopId)) {
 			//商城和下单页
 			if (in_array($action->id, $this->guestAccessAction) == false) {
 				util::fail('您没有权限访问哦~');
 			}
-			$shop = ShopClass::getById($shopId);
+			$shop = ShopClass::getById($lookShopId);
 			if (empty($shop)) {
 				util::fail('没有找到店铺');
 			}
+			$this->lookShopId = $lookShopId;
 			$sjId = $shop['merchantId'] ?? 0;
 			$sj = MerchantService::getMerchantById($sjId);
 			$sjExtend = MerchantExtendClass::getByMerchantId($sjId);
@@ -62,18 +61,18 @@ class BaseController extends PublicController
 			if (empty($currentShopId) && in_array($action->id, $this->guestAccessAction) == false) {
 				util::fail('您没有权限访问哦！');
 			}
+			$this->shopId = $currentShopId;
 			$shop = ShopService::getById($currentShopId);
 			if (empty($shop)) {
 				util::fail('没有找到您管理的门店');
 			}
 			$sjId = $shop['merchantId'];
+			$this->sjId = $sjId;
 			$sj = MerchantService::getMerchantById($sjId);
+			$this->sj = $sj;
 			$sjExtend = MerchantExtendService::getByMerchantId($sjId);
+			$this->sjExtend = $sjExtend;
 		}
-		$this->shopId = $currentShopId;
-		$this->sjId = $sjId;
-		$this->sj = $sj;
-		$this->sjExtend = $sjExtend;
 		return parent::beforeAction($action);
 	}
 	

app/ghs/controllers/ProductController.php

@@ -7,6 +7,7 @@
 namespace ghs\controllers;
 
 
+use bizGhs\admin\classes\AdminClass;
 use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\product\classes\ProductClass;
@@ -26,6 +27,9 @@ class ProductController extends BaseController
         $py = Yii::$app->request->get('py','');
         $type = Yii::$app->request->get('type','');
 
+        //访问店铺时用户增加最近访问的店铺 shish 2021.3.1
+        AdminClass::addRecentShop($this->lookShopId,$this->admin);
+        
         //获取所有当前供应商的分类 （全部、常用）
         //根据分类组装分类下的花材信息
         $classIds = ItemClassClass::getGhsItemClassAll($this->sjId);

app/shop/controllers/AdminController.php

@@ -12,199 +12,206 @@ use biz\user\classes\UserClass;
 
 class AdminController extends BaseController
 {
-
-    public $guestAccessAction = [];
-
-    //获取登陆员工的权限 shish 2019.11.24
-    public function actionLoginAuth()
-    {
-        $auth = AdminService::getAuth($this->adminId, $this->sjId);
-        util::success($auth);
-    }
-
-    //添加员工 shish 2019.12.8
-    public function actionAdd()
-    {
-        $post = Yii::$app->request->post();
-        $post['merchantId'] = $this->sjId;
-        $admin = AdminService::addAdmin($post);
-        $id = $admin['id'];
-        $info = AdminService::getDetail($id);
-        util::success($info);
-    }
-
-    //删除员工 shish 2019.12.9
-    public function actionDelete()
-    {
-        $id = Yii::$app->request->post('id');
-        $admin = AdminClass::getById($id);
-        AdminService::valid($admin, $this->sjId);
-        AdminService::deleteAdmin($admin, $this->adminId);
-        util::complete();
-    }
-
-    //修改员工 shish 2019.12.9
-    public function actionUpdate()
-    {
-        $post = Yii::$app->request->post();
-        $id = isset($post['id']) && is_numeric($post['id']) ? $post['id'] : 0;
-        unset($post['id']);
-        $originalAdmin = AdminService::getById($id);
-        $post['merchantId'] = $this->sjId;
-        AdminService::updateAdmin($originalAdmin, $post);
-        util::complete('修改成功');
-    }
-
-    //查看员工详情 shish 2019.12.9
-    public function actionDetail()
-    {
-        $id = Yii::$app->request->get('id');
-        $admin = AdminService::getDetail($id);
-        AdminService::valid($admin, $this->sjId);
-        util::success($admin);
-    }
-
-    //密码修改
-    public function actionPassword()
-    {
-        $post = Yii::$app->request->post();
-        $old = isset($post['old']) ? $post['old'] : '';
-        $new = isset($post['new']) ? $post['new'] : '';
-        $confirm = isset($post['confirm']) ? $post['confirm'] : '';
-        if (empty($new)) {
-            util::fail('请输入新密码');
-        }
-        if ($new != $confirm) {
-            util::fail('二次密码不一致');
-        }
-        $admin = $this->admin;
-        $adminId = $this->adminId;
-        if (!empty($admin['password'])) {
-            if (empty($old)) {
-                util::fail('请填写旧密码');
-            }
-            if (password_verify($old, $admin['password']) == false) {
-                util::fail('旧密码错误');
-            }
-        }
-        AdminService::updateById($adminId, ['password' => password_hash($new, PASSWORD_BCRYPT)]);
-        util::complete('修改成功');
-    }
-
-    //确认密码修改
-    public function actionConfirmPassword()
-    {
-        $post = Yii::$app->request->post();
-        $old = isset($post['old']) ? $post['old'] : '';
-        $new = isset($post['new']) ? $post['new'] : '';
-        $confirm = isset($post['confirm']) ? $post['confirm'] : '';
-        if (empty($new)) {
-            util::fail('请输入新密码');
-        }
-        if ($new != $confirm) {
-            util::fail('二次密码不一致');
-        }
-        $admin = $this->admin;
-        $adminId = $this->adminId;
-        if (!empty($admin['confirmPassword'])) {
-            if (empty($old)) {
-                util::fail('请填写旧密码');
-            }
-            if (password_verify($old, $admin['confirmPassword']) == false) {
-                util::fail('旧密码错误');
-            }
-        }
-        AdminService::updateById($adminId, ['confirmPassword' => password_hash($new, PASSWORD_BCRYPT)]);
-        util::complete('修改成功');
-    }
-
-    //登陆员工的详情 shish 2019.12.26
-    public function actionLoginDetail()
-    {
-        $detail = AdminService::getDetail($this->adminId);
-        util::success($detail);
-    }
-
-
-    //小程序用户完整信息 shish 2019.12.12
-    public function actionMiniFullInfo()
-    {
-        $post = Yii::$app->request->post();
-        $iv = isset($post['iv']) ? $post['iv'] : '';
-        $encryptedData = isset($post['encryptedData']) ? $post['encryptedData'] : '';
-        $merchant = WxOpenService::getWxInfo();
-        $appId = $merchant['miniAppId'];
-        $admin = $this->admin;
-        $miniOpenId = $admin['miniOpenId'];
-        if (empty($miniOpenId)) {
-            util::fail('没有找到管理员信息(miniOpenId)');
-        }
-        $cacheKey = 'SHOP_MINI_SESSION_KEY_' . $miniOpenId;
-        $sessionKey = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
-        $wxMiniSecret = Yii::getAlias("@vendor/weixinMiniSecret");
-        require_once($wxMiniSecret . '/wxBizDataCrypt.php');
-        $pc = new \WXBizDataCrypt($appId, $sessionKey);
-        $errCode = $pc->decryptData($encryptedData, $iv, $result);
-        if ($errCode != 0) {
-            Yii::info($result . ' ' . $errCode);
-            util::fail('获取用户信息失败');
-        }
-        Yii::info('小程序获取用户信息：' . $result);
-        $originalInfo = Json::decode($result);
-        $source = UserClass::$userSourceId['mini']['name'];
-        $admin = AdminService::replaceAdmin($originalInfo, $source);
-        $adminId = $admin['id'];
-        $admin = AdminService::getAdminById($adminId);
-        util::success($admin);
-    }
-
-    //小程序用户手机号
-    public function actionMiniMobile()
-    {
-        $post = Yii::$app->request->post();
-        $iv = $post['iv'];
-        $encryptedData = $post['encryptedData'];
-        $merchant = WxOpenService::getWxInfo();
-        $appId = $merchant['miniAppId'];
-        $admin = $this->admin;
-        $miniOpenId = $admin['miniOpenId'];
-        if (empty($miniOpenId)) {
-            util::fail('没有找到管理员信息(miniOpenId)');
-        }
-        $cacheKey = 'SHOP_MINI_SESSION_KEY_' . $miniOpenId;
-        $sessionKey = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
-        if (empty($sessionKey)) {
-            util::fail('sesstion key empty');
-        }
-        $wxMiniSecret = Yii::getAlias("@vendor/weixinMiniSecret");
-        require_once($wxMiniSecret . '/wxBizDataCrypt.php');
-
-        $pc = new \WXBizDataCrypt($appId, $sessionKey);
-        $errCode = $pc->decryptData($encryptedData, $iv, $result);
-        if ($errCode != 0) {
-            util::fail('解密失败');
-        }
-        $arr = Json::decode($result);
-        $mobile = isset($arr['purePhoneNumber']) ? $arr['purePhoneNumber'] : '';
-        util::success(['mobile' => $mobile]);
-    }
-
-    //设置支付密码 shish 2021.1.24
-    public function actionSetPayPassword()
-    {
-        $get = Yii::$app->request->get();
-        $adminId = $this->adminId;
-        $info = AdminClass::getAdminById($adminId, false);
-        if (isset($info['payPassword']) && !empty($info['payPassword'])) {
-            util::fail('您已经设置了支付密码');
-        }
-        $password = $get['password'] ?? '';
-        if (empty($password)) {
-            util::fail('请输入支付密码');
-        }
-        $string = password_hash($password, PASSWORD_BCRYPT);
-        AdminClass::updateById($adminId, ['payPassword' => $string]);
-        util::complete();
-    }
-
+	
+	public $guestAccessAction = [];
+	
+	//最近店铺 shish 2021.2.27
+	public function actionRecentShop()
+	{
+		$respond = AdminClass::getRecentShop($this->admin);
+		util::success($data);
+	}
+	
+	//获取登陆员工的权限 shish 2019.11.24
+	public function actionLoginAuth()
+	{
+		$auth = AdminService::getAuth($this->adminId, $this->sjId);
+		util::success($auth);
+	}
+	
+	//添加员工 shish 2019.12.8
+	public function actionAdd()
+	{
+		$post = Yii::$app->request->post();
+		$post['merchantId'] = $this->sjId;
+		$admin = AdminService::addAdmin($post);
+		$id = $admin['id'];
+		$info = AdminService::getDetail($id);
+		util::success($info);
+	}
+	
+	//删除员工 shish 2019.12.9
+	public function actionDelete()
+	{
+		$id = Yii::$app->request->post('id');
+		$admin = AdminClass::getById($id);
+		AdminService::valid($admin, $this->sjId);
+		AdminService::deleteAdmin($admin, $this->adminId);
+		util::complete();
+	}
+	
+	//修改员工 shish 2019.12.9
+	public function actionUpdate()
+	{
+		$post = Yii::$app->request->post();
+		$id = isset($post['id']) && is_numeric($post['id']) ? $post['id'] : 0;
+		unset($post['id']);
+		$originalAdmin = AdminService::getById($id);
+		$post['merchantId'] = $this->sjId;
+		AdminService::updateAdmin($originalAdmin, $post);
+		util::complete('修改成功');
+	}
+	
+	//查看员工详情 shish 2019.12.9
+	public function actionDetail()
+	{
+		$id = Yii::$app->request->get('id');
+		$admin = AdminService::getDetail($id);
+		AdminService::valid($admin, $this->sjId);
+		util::success($admin);
+	}
+	
+	//密码修改
+	public function actionPassword()
+	{
+		$post = Yii::$app->request->post();
+		$old = isset($post['old']) ? $post['old'] : '';
+		$new = isset($post['new']) ? $post['new'] : '';
+		$confirm = isset($post['confirm']) ? $post['confirm'] : '';
+		if (empty($new)) {
+			util::fail('请输入新密码');
+		}
+		if ($new != $confirm) {
+			util::fail('二次密码不一致');
+		}
+		$admin = $this->admin;
+		$adminId = $this->adminId;
+		if (!empty($admin['password'])) {
+			if (empty($old)) {
+				util::fail('请填写旧密码');
+			}
+			if (password_verify($old, $admin['password']) == false) {
+				util::fail('旧密码错误');
+			}
+		}
+		AdminService::updateById($adminId, ['password' => password_hash($new, PASSWORD_BCRYPT)]);
+		util::complete('修改成功');
+	}
+	
+	//确认密码修改
+	public function actionConfirmPassword()
+	{
+		$post = Yii::$app->request->post();
+		$old = isset($post['old']) ? $post['old'] : '';
+		$new = isset($post['new']) ? $post['new'] : '';
+		$confirm = isset($post['confirm']) ? $post['confirm'] : '';
+		if (empty($new)) {
+			util::fail('请输入新密码');
+		}
+		if ($new != $confirm) {
+			util::fail('二次密码不一致');
+		}
+		$admin = $this->admin;
+		$adminId = $this->adminId;
+		if (!empty($admin['confirmPassword'])) {
+			if (empty($old)) {
+				util::fail('请填写旧密码');
+			}
+			if (password_verify($old, $admin['confirmPassword']) == false) {
+				util::fail('旧密码错误');
+			}
+		}
+		AdminService::updateById($adminId, ['confirmPassword' => password_hash($new, PASSWORD_BCRYPT)]);
+		util::complete('修改成功');
+	}
+	
+	//登陆员工的详情 shish 2019.12.26
+	public function actionLoginDetail()
+	{
+		$detail = AdminService::getDetail($this->adminId);
+		util::success($detail);
+	}
+	
+	
+	//小程序用户完整信息 shish 2019.12.12
+	public function actionMiniFullInfo()
+	{
+		$post = Yii::$app->request->post();
+		$iv = isset($post['iv']) ? $post['iv'] : '';
+		$encryptedData = isset($post['encryptedData']) ? $post['encryptedData'] : '';
+		$merchant = WxOpenService::getWxInfo();
+		$appId = $merchant['miniAppId'];
+		$admin = $this->admin;
+		$miniOpenId = $admin['miniOpenId'];
+		if (empty($miniOpenId)) {
+			util::fail('没有找到管理员信息(miniOpenId)');
+		}
+		$cacheKey = 'SHOP_MINI_SESSION_KEY_' . $miniOpenId;
+		$sessionKey = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
+		$wxMiniSecret = Yii::getAlias("@vendor/weixinMiniSecret");
+		require_once($wxMiniSecret . '/wxBizDataCrypt.php');
+		$pc = new \WXBizDataCrypt($appId, $sessionKey);
+		$errCode = $pc->decryptData($encryptedData, $iv, $result);
+		if ($errCode != 0) {
+			Yii::info($result . ' ' . $errCode);
+			util::fail('获取用户信息失败');
+		}
+		Yii::info('小程序获取用户信息：' . $result);
+		$originalInfo = Json::decode($result);
+		$source = UserClass::$userSourceId['mini']['name'];
+		$admin = AdminService::replaceAdmin($originalInfo, $source);
+		$adminId = $admin['id'];
+		$admin = AdminService::getAdminById($adminId);
+		util::success($admin);
+	}
+	
+	//小程序用户手机号
+	public function actionMiniMobile()
+	{
+		$post = Yii::$app->request->post();
+		$iv = $post['iv'];
+		$encryptedData = $post['encryptedData'];
+		$merchant = WxOpenService::getWxInfo();
+		$appId = $merchant['miniAppId'];
+		$admin = $this->admin;
+		$miniOpenId = $admin['miniOpenId'];
+		if (empty($miniOpenId)) {
+			util::fail('没有找到管理员信息(miniOpenId)');
+		}
+		$cacheKey = 'SHOP_MINI_SESSION_KEY_' . $miniOpenId;
+		$sessionKey = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
+		if (empty($sessionKey)) {
+			util::fail('sesstion key empty');
+		}
+		$wxMiniSecret = Yii::getAlias("@vendor/weixinMiniSecret");
+		require_once($wxMiniSecret . '/wxBizDataCrypt.php');
+		
+		$pc = new \WXBizDataCrypt($appId, $sessionKey);
+		$errCode = $pc->decryptData($encryptedData, $iv, $result);
+		if ($errCode != 0) {
+			util::fail('解密失败');
+		}
+		$arr = Json::decode($result);
+		$mobile = isset($arr['purePhoneNumber']) ? $arr['purePhoneNumber'] : '';
+		util::success(['mobile' => $mobile]);
+	}
+	
+	//设置支付密码 shish 2021.1.24
+	public function actionSetPayPassword()
+	{
+		$get = Yii::$app->request->get();
+		$adminId = $this->adminId;
+		$info = AdminClass::getAdminById($adminId, false);
+		if (isset($info['payPassword']) && !empty($info['payPassword'])) {
+			util::fail('您已经设置了支付密码');
+		}
+		$password = $get['password'] ?? '';
+		if (empty($password)) {
+			util::fail('请输入支付密码');
+		}
+		$string = password_hash($password, PASSWORD_BCRYPT);
+		AdminClass::updateById($adminId, ['payPassword' => $string]);
+		util::complete();
+	}
+	
 }

app/shop/controllers/BaseController.php

@@ -77,20 +77,20 @@ class BaseController extends PublicController
 			if (empty($currentShopId) && in_array($action->id, $this->guestAccessAction) == false) {
 				util::fail('您没有权限访问哦~');
 			}
+			$this->shopId = $currentShopId;
 			$shop = ShopService::getById($currentShopId);
+			if (empty($shop)) {
+				util::fail('没有找到店铺');
+			}
 			$sjId = $shop['merchantId'];
-			$sj = MerchantService::getMerchantById($sjId);
-			$sj = $sj;
-			$this->shopId = $currentShopId;
 			$this->sjId = $sjId;
+			$sj = MerchantService::getMerchantById($sjId);
+			$this->sj = $sj;
 			$sjExtend = MerchantExtendClass::getByMerchantId($sjId);
+			$this->sjExtend = $sjExtend;
 		}
-		$this->shopId = $currentShopId;
-		$this->sjId = $sjId;
-		$this->sj = $sj;
-		$this->sjExtend = $sjExtend;
 		return parent::beforeAction($action);
 	}
-	
+
 }
 

biz-ghs/admin/classes/AdminClass.php

@@ -12,413 +12,451 @@ use bizGhs\base\classes\BaseClass;
 
 class AdminClass extends BaseClass
 {
-
-    public static $baseFile = '\bizGhs\admin\models\Admin';
-
-    //未知身份
-    CONST IDENTITY_UNKNOWN = 0;
-    //客户，花店
-    const IDENTITY_CUSTOM = 1;
-    //供货商员工
-    const IDENTITY_STAFF = 2;
-
-    //开店时初始化员工和角色
-    public static function initAdmin($applyData, $sjId, $shopId)
-    {
-        $mobile = $applyData['mobile'] ?? 0;
-        $adminId = $applyData['adminId'] ?? 0;
-
-        //创建管理员角色
-        $roleId = 0;
-        $hasRole = AdminRoleClass::getByCondition(['merchantId' => $sjId]);
-        if (empty($hasRole)) {
-            $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
-            $roleId = $roleReturn['id'];
-        }
-        //创建管理员
-        if (!empty($adminId)) {
-            $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
-            if (empty($shopAdmin)) {
-                $adminData = [
-                    'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                    'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
-                    'mobile' => $mobile
-                ];
-                self::updateById($adminId, $adminData);
-                $shopData = [
-                    'adminId' => $adminId,
-                    'shopId' => $shopId,
-                    'merchantId' => $sjId,
-                    'remind' => 1,
-                    'roleId' => $roleId,
-                    'default' => 1,
-                ];
-                ShopAdminClass::add($shopData);
-            }
-        }
-    }
-
-    //组合员工基本信息 shish 2019.12.9
-    public static function groupAdminBaseInfo($list, $sensitive = true)
-    {
-        $prefix = Yii::$app->params['imgHost'];
-        $defaultAvatar = $prefix . '/retail/default-avatar.png';
-        foreach ($list as $key => $val) {
-            $roleId = 0;
-            $list[$key]['roleName'] = '';
-            $avatar = isset($val['avatar']) && !empty($val['avatar']) ? $prefix . $val['avatar'] : $defaultAvatar;
-            $list[$key]['avatar'] = $avatar;
-            $list[$key]['addDate'] = date("Y-m-d H:i", $val['addTime']);
-            $list[$key]['lastLoginTime'] = date("Y-m-d H:i", $val['loginTime']);
-            //敏感信息
-            if ($sensitive) {
-                //这里需要输出值secret，否则修改密码那边会有问题
-                $list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
-                $list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
-                $list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
-            }
-        }
-        return $list;
-    }
-
-    //取单个员工详情 shish 2019.12.9
-    public static function getAdminById($id)
-    {
-        $detail = AdminClass::getById($id);
-        if (empty($detail)) {
-            util::fail('没有找到员工信息！');
-        }
-        $list = self::groupAdminBaseInfo([$detail]);
-        return current($list);
-    }
-
-    //取多个员工信息 shish 2021.1.19
-    public static function getAdminByIds($ids)
-    {
-        $adminList = self::getByIds($ids, null, 'id');
-        if (empty($adminList)) {
-            return [];
-        }
-        $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);
-        if (empty($admin)) {
-            util::fail('没有找到管理员信息');
-        }
-        $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
-        $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)
-    {
-        if (empty($admin)) {
-            util::fail('员工信息无效');
-        }
-        $adminId = $admin['id'] ?? 0;
-        $staff = ShopAdminClass::getByCondition(['merchantId' => $merchantId, 'adminId' => $adminId]);
-        if (empty($staff)) {
-            util::fail('您没有权限操作');
-        }
-    }
-
-    //删除员工，需要考虑权限 shish 2019.12.9
-    public static function deleteAdmin($admin, $adminId)
-    {
-        $id = $admin['id'];
-        if ($admin['super'] == 1) {
-            util::fail('超级管理员不能删除');
-        }
-        if ($id == $adminId) {
-            util::fail('不能删除自己');
-        }
-        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)
-    {
-        $adminInfo = self::switchAdminInfo($adminInfo, $source);
-        $adminSource = UserClass::$userSourceId;
-        $unionId = isset($adminInfo['unionId']) && !empty($adminInfo['unionId']) ? $adminInfo['unionId'] : '';
-        $unionAdmin = [];
-        if (!empty($unionId)) {
-            $unionAdmin = self::getByUnionId($unionId);
-        }
-        switch ($source) {
-            case $adminSource['mini']['name']:
-                $sourceId = $adminSource['mini']['id'];
-                $miniOpenId = $adminInfo['miniOpenId'];
-                $admin = self::getByMiniOpenId($miniOpenId);
-                break;
-            case $adminSource['official']['name']:
-                $sourceId = $adminSource['official']['id'];
-                $openId = isset($adminInfo['openId']) ? $adminInfo['openId'] : '';
-                $admin = [];
-                if (!empty($openId)) {
-                    $admin = self::getByOpenId($openId);
-                }
-                break;
-            default:
-                throw new \Exception('未知来源的用户');
-        }
-        if (empty($admin)) {
-            if (!empty($unionAdmin)) {
-                //1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
-                //2、关注了公众号或者H5已经授权时，并首次访问小程序
-                $admin = self::updateAdmin($unionAdmin, $adminInfo);
-            } else {
-                $adminInfo['sourceType'] = $sourceId;
-                $admin = self::generateAdmin($adminInfo);
-            }
-        } else {
-            if (!empty($unionAdmin)) {
-                if (isset($unionAdmin['id']) && isset($admin['id']) && $admin['id'] != $unionAdmin['id']) {
-                    //合并相同管理员，小程序管理保留，其它删除
-                    $admin = self::mergeAdmin($unionAdmin, $admin);
-                }
-            }
-            $admin = self::updateAdmin($admin, $adminInfo);
-        }
-        return $admin;
-    }
-
-    //更新员工信息 shish 2020.5.30
-    public static function updateAdmin($originalAdmin, $getAdminInfo)
-    {
-        $data = [];
-        $adminId = $originalAdmin['id'];
-        //替换掉微信不支持的图片
-        $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
-        if (!empty($nickName)) {
-            $data['nickName'] = $nickName;
-        }
-        if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
-            $data['adminName'] = $nickName;
-        }
-        if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
-            $openId = $getAdminInfo['openId'];
-            $data['openId'] = $openId;
-        }
-        if (isset($getAdminInfo['miniOpenId']) && !empty($getAdminInfo['miniOpenId'])) {
-            $data['miniOpenId'] = $getAdminInfo['miniOpenId'];
-        }
-        if (isset($getAdminInfo['unionId']) && !empty($getAdminInfo['unionId'])) {
-            $data['unionId'] = $getAdminInfo['unionId'];
-        }
-        if (isset($getAdminInfo['sex'])) {
-            $data['sex'] = $getAdminInfo['sex'];
-        }
-        if (isset($getAdminInfo['subscribe'])) {
-            $data['subscribe'] = $getAdminInfo['subscribe'];
-        }
-        if (isset($getAdminInfo['subscribeTime'])) {
-            $data['subscribeTime'] = $getAdminInfo['subscribeTime'];
-        }
-        if (isset($getAdminInfo['isFull'])) {
-            $data['isFull'] = $getAdminInfo['isFull'];
-        }
-        if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
-            $data['isFull'] = 1;
-        }
-
-        //更新头像
-        $merchantId = 0;
-        if (isset($originalAdmin['avatar']) == false || empty($originalAdmin['avatar'])) {
-            if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
-                $imgUrl = $getAdminInfo['headImgUrl'];
-                $name = ImageService::generateAvatar($merchantId, $imgUrl);
-                if (!empty($name)) {
-                    $data['avatar'] = $name;
-                }
-            }
-        }
-
-        self::updateById($adminId, $data);
-        $admin = self::getById($adminId);
-        return $admin;
-    }
-
-    public static function generateAdmin($getAdminInfo)
-    {
-        $time = time();
-        //替换掉微信名称不支持的图片
-        $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
-        $getAdminInfo['nickName'] = $nickName;
-        $getAdminInfo['adminName'] = $nickName;
-        $subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
-        $getAdminInfo['subscribe'] = $subscribe;
-        $getAdminInfo['avatar'] = '';
-        $getAdminInfo['password'] = '';
-        $getAdminInfo['payPassword'] = '';
-        $getAdminInfo['mobile'] = isset($getAdminInfo['mobile']) ? $getAdminInfo['mobile'] : '';
-        $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);
-            if (!empty($name)) {
-                $getAdminInfo['avatar'] = $name;
-            }
-        }
-
-        $admin = self::add($getAdminInfo);
-        $adminId = $admin['id'];
-        if (empty($nickName)) {
-            self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
-        }
-        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)
-    {
-        $openId = '';
-        if (isset($info['openid']) && !empty($info['openid'])) {
-            $openId = $info['openid'];
-            unset($info['openId']);
-        }
-        if (isset($info['openId']) && !empty($info['openId'])) {
-            $openId = $info['openId'];
-            unset($info['openId']);
-        }
-        if (!empty($openId)) {
-            $adminSource = UserClass::$userSourceId;
-            switch ($source) {
-                case $adminSource['mini']['name']:
-                    $info['miniOpenId'] = $openId;
-                    break;
-                case $adminSource['official']['name']:
-                    $info['openId'] = $openId;
-                    break;
-                default:
-            }
-        }
-        if (isset($info['nickName'])) {
-            $info['nickName'] = $info['nickName'];
-        }
-        if (isset($info['unionid'])) {
-            $info['unionId'] = $info['unionid'];
-        }
-        if (isset($info['unionId'])) {
-            $info['unionId'] = $info['unionId'];
-        }
-        if (isset($info['headimgurl'])) {
-            $info['headImgUrl'] = $info['headimgurl'];
-        }
-        if (isset($info['avatarUrl'])) {
-            $info['headImgUrl'] = $info['avatarUrl'];
-        }
-        if (isset($info['subscribe_time'])) {
-            $info['subscribeTime'] = $info['subscribe_time'];
-        }
-        if (isset($info['subscribe'])) {
-            $info['subscribe'] = $info['subscribe'];
-        }
-        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($admin, $toggleShopId, $sjId)
-    {
-        if ($admin['super'] != 1) {
-            util::fail("您没有权限");
-        }
-        $adminId = $admin['id'];
-        $currentShopId = $admin['currentShopId'] ?? 0;
-        $sjShopList = ShopClass::getSjShopList($sjId);
-        $sjShopIds = array_column($sjShopList, 'id');
-        if (in_array($toggleShopId, $sjShopIds) == false) {
-            util::fail('不是您的门店');
-        }
-        $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $toggleShopId, 'adminId' => $adminId, 'delStatus' => 0]);
-        if (empty($shopAdmin)) {
-            util::fail('您没有权限哦');
-        }
-        self::updateById($adminId, ['currentShopId' => $toggleShopId]);
-        return $shopAdmin;
-    }
-
+	
+	public static $baseFile = '\bizGhs\admin\models\Admin';
+	
+	//未知身份
+	CONST IDENTITY_UNKNOWN = 0;
+	//客户，花店
+	const IDENTITY_CUSTOM = 1;
+	//供货商员工
+	const IDENTITY_STAFF = 2;
+	
+	public static function getRecentShop($admin)
+	{
+		$recent = $admin['recentShop'];
+		$arr = [];
+		if (!empty($recent)) {
+			$ids = json_decode($recent, true);
+			$list = self::getAdminByIds($ids);
+			if (!empty($list)) {
+				foreach ($list as $key => $val) {
+					$arr[] = [
+						'shopId' => $val['id'],
+						'shopName' => $val['shopName'],
+						'shopImg' => $val['avatar'],
+					];
+				}
+			}
+		}
+		return $arr;
+	}
+	
+	//最近访问的门店 shish 2021.3.1
+	public static function addRecentShop($lookShopId, $admin)
+	{
+		if (empty($lookShopId)) {
+			return false;
+		}
+		$hasRecentShop = $admin['recentShop'];
+		$adminId = $admin['id'];
+		$newShopIds = [];
+		if (!empty($hasRecentShop)) {
+			$newShopIds = json_decode($hasRecentShop, true);
+		}
+		$newShopIds = array_merge($newShopIds, [$lookShopId]);
+		$newShopIds = array_unique(array_filter($newShopIds));
+		self::updateById($adminId, ['recentShop' => json_encode($newShopIds)]);
+	}
+	
+	//开店时初始化员工和角色
+	public static function initAdmin($applyData, $sjId, $shopId)
+	{
+		$mobile = $applyData['mobile'] ?? 0;
+		$adminId = $applyData['adminId'] ?? 0;
+		
+		//创建管理员角色
+		$roleId = 0;
+		$hasRole = AdminRoleClass::getByCondition(['merchantId' => $sjId]);
+		if (empty($hasRole)) {
+			$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
+			$roleId = $roleReturn['id'];
+		}
+		//创建管理员
+		if (!empty($adminId)) {
+			$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
+			if (empty($shopAdmin)) {
+				$adminData = [
+					'password' => password_hash($mobile, PASSWORD_BCRYPT),
+					'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
+					'mobile' => $mobile
+				];
+				self::updateById($adminId, $adminData);
+				$shopData = [
+					'adminId' => $adminId,
+					'shopId' => $shopId,
+					'merchantId' => $sjId,
+					'remind' => 1,
+					'roleId' => $roleId,
+					'default' => 1,
+				];
+				ShopAdminClass::add($shopData);
+			}
+		}
+	}
+	
+	//组合员工基本信息 shish 2019.12.9
+	public static function groupAdminBaseInfo($list, $sensitive = true)
+	{
+		$prefix = Yii::$app->params['imgHost'];
+		$defaultAvatar = $prefix . '/retail/default-avatar.png';
+		foreach ($list as $key => $val) {
+			$roleId = 0;
+			$list[$key]['roleName'] = '';
+			$avatar = isset($val['avatar']) && !empty($val['avatar']) ? $prefix . $val['avatar'] : $defaultAvatar;
+			$avatar = $avatar;
+			$list[$key]['avatar'] = $avatar;
+			$list[$key]['addDate'] = date("Y-m-d H:i", $val['addTime']);
+			$list[$key]['lastLoginTime'] = date("Y-m-d H:i", $val['loginTime']);
+			//敏感信息
+			if ($sensitive) {
+				//这里需要输出值secret，否则修改密码那边会有问题
+				$list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
+				$list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
+				$list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
+			}
+		}
+		return $list;
+	}
+	
+	//取单个员工详情 shish 2019.12.9
+	public static function getAdminById($id)
+	{
+		$detail = AdminClass::getById($id);
+		if (empty($detail)) {
+			util::fail('没有找到员工信息！');
+		}
+		$list = self::groupAdminBaseInfo([$detail]);
+		return current($list);
+	}
+	
+	//取多个员工信息 shish 2021.1.19
+	public static function getAdminByIds($ids)
+	{
+		$adminList = self::getByIds($ids, null, 'id');
+		if (empty($adminList)) {
+			return [];
+		}
+		$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);
+		if (empty($admin)) {
+			util::fail('没有找到管理员信息');
+		}
+		$data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
+		$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)
+	{
+		if (empty($admin)) {
+			util::fail('员工信息无效');
+		}
+		$adminId = $admin['id'] ?? 0;
+		$staff = ShopAdminClass::getByCondition(['merchantId' => $merchantId, 'adminId' => $adminId]);
+		if (empty($staff)) {
+			util::fail('您没有权限操作');
+		}
+	}
+	
+	//删除员工，需要考虑权限 shish 2019.12.9
+	public static function deleteAdmin($admin, $adminId)
+	{
+		$id = $admin['id'];
+		if ($admin['super'] == 1) {
+			util::fail('超级管理员不能删除');
+		}
+		if ($id == $adminId) {
+			util::fail('不能删除自己');
+		}
+		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)
+	{
+		$adminInfo = self::switchAdminInfo($adminInfo, $source);
+		$adminSource = UserClass::$userSourceId;
+		$unionId = isset($adminInfo['unionId']) && !empty($adminInfo['unionId']) ? $adminInfo['unionId'] : '';
+		$unionAdmin = [];
+		if (!empty($unionId)) {
+			$unionAdmin = self::getByUnionId($unionId);
+		}
+		switch ($source) {
+			case $adminSource['mini']['name']:
+				$sourceId = $adminSource['mini']['id'];
+				$miniOpenId = $adminInfo['miniOpenId'];
+				$admin = self::getByMiniOpenId($miniOpenId);
+				break;
+			case $adminSource['official']['name']:
+				$sourceId = $adminSource['official']['id'];
+				$openId = isset($adminInfo['openId']) ? $adminInfo['openId'] : '';
+				$admin = [];
+				if (!empty($openId)) {
+					$admin = self::getByOpenId($openId);
+				}
+				break;
+			default:
+				throw new \Exception('未知来源的用户');
+		}
+		if (empty($admin)) {
+			if (!empty($unionAdmin)) {
+				//1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
+				//2、关注了公众号或者H5已经授权时，并首次访问小程序
+				$admin = self::updateAdmin($unionAdmin, $adminInfo);
+			} else {
+				$adminInfo['sourceType'] = $sourceId;
+				$admin = self::generateAdmin($adminInfo);
+			}
+		} else {
+			if (!empty($unionAdmin)) {
+				if (isset($unionAdmin['id']) && isset($admin['id']) && $admin['id'] != $unionAdmin['id']) {
+					//合并相同管理员，小程序管理保留，其它删除
+					$admin = self::mergeAdmin($unionAdmin, $admin);
+				}
+			}
+			$admin = self::updateAdmin($admin, $adminInfo);
+		}
+		return $admin;
+	}
+	
+	//更新员工信息 shish 2020.5.30
+	public static function updateAdmin($originalAdmin, $getAdminInfo)
+	{
+		$data = [];
+		$adminId = $originalAdmin['id'];
+		//替换掉微信不支持的图片
+		$nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
+		if (!empty($nickName)) {
+			$data['nickName'] = $nickName;
+		}
+		if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
+			$data['adminName'] = $nickName;
+		}
+		if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
+			$openId = $getAdminInfo['openId'];
+			$data['openId'] = $openId;
+		}
+		if (isset($getAdminInfo['miniOpenId']) && !empty($getAdminInfo['miniOpenId'])) {
+			$data['miniOpenId'] = $getAdminInfo['miniOpenId'];
+		}
+		if (isset($getAdminInfo['unionId']) && !empty($getAdminInfo['unionId'])) {
+			$data['unionId'] = $getAdminInfo['unionId'];
+		}
+		if (isset($getAdminInfo['sex'])) {
+			$data['sex'] = $getAdminInfo['sex'];
+		}
+		if (isset($getAdminInfo['subscribe'])) {
+			$data['subscribe'] = $getAdminInfo['subscribe'];
+		}
+		if (isset($getAdminInfo['subscribeTime'])) {
+			$data['subscribeTime'] = $getAdminInfo['subscribeTime'];
+		}
+		if (isset($getAdminInfo['isFull'])) {
+			$data['isFull'] = $getAdminInfo['isFull'];
+		}
+		if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
+			$data['isFull'] = 1;
+		}
+		
+		//更新头像
+		$merchantId = 0;
+		if (isset($originalAdmin['avatar']) == false || empty($originalAdmin['avatar'])) {
+			if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
+				$imgUrl = $getAdminInfo['headImgUrl'];
+				$name = ImageService::generateAvatar($merchantId, $imgUrl);
+				if (!empty($name)) {
+					$data['avatar'] = $name;
+				}
+			}
+		}
+		
+		self::updateById($adminId, $data);
+		$admin = self::getById($adminId);
+		return $admin;
+	}
+	
+	public static function generateAdmin($getAdminInfo)
+	{
+		$time = time();
+		//替换掉微信名称不支持的图片
+		$nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
+		$getAdminInfo['nickName'] = $nickName;
+		$getAdminInfo['adminName'] = $nickName;
+		$subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
+		$getAdminInfo['subscribe'] = $subscribe;
+		$getAdminInfo['avatar'] = '';
+		$getAdminInfo['password'] = '';
+		$getAdminInfo['payPassword'] = '';
+		$getAdminInfo['mobile'] = isset($getAdminInfo['mobile']) ? $getAdminInfo['mobile'] : '';
+		$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);
+			if (!empty($name)) {
+				$getAdminInfo['avatar'] = $name;
+			}
+		}
+		
+		$admin = self::add($getAdminInfo);
+		$adminId = $admin['id'];
+		if (empty($nickName)) {
+			self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
+		}
+		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)
+	{
+		$openId = '';
+		if (isset($info['openid']) && !empty($info['openid'])) {
+			$openId = $info['openid'];
+			unset($info['openId']);
+		}
+		if (isset($info['openId']) && !empty($info['openId'])) {
+			$openId = $info['openId'];
+			unset($info['openId']);
+		}
+		if (!empty($openId)) {
+			$adminSource = UserClass::$userSourceId;
+			switch ($source) {
+				case $adminSource['mini']['name']:
+					$info['miniOpenId'] = $openId;
+					break;
+				case $adminSource['official']['name']:
+					$info['openId'] = $openId;
+					break;
+				default:
+			}
+		}
+		if (isset($info['nickName'])) {
+			$info['nickName'] = $info['nickName'];
+		}
+		if (isset($info['unionid'])) {
+			$info['unionId'] = $info['unionid'];
+		}
+		if (isset($info['unionId'])) {
+			$info['unionId'] = $info['unionId'];
+		}
+		if (isset($info['headimgurl'])) {
+			$info['headImgUrl'] = $info['headimgurl'];
+		}
+		if (isset($info['avatarUrl'])) {
+			$info['headImgUrl'] = $info['avatarUrl'];
+		}
+		if (isset($info['subscribe_time'])) {
+			$info['subscribeTime'] = $info['subscribe_time'];
+		}
+		if (isset($info['subscribe'])) {
+			$info['subscribe'] = $info['subscribe'];
+		}
+		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($admin, $toggleShopId, $sjId)
+	{
+		if ($admin['super'] != 1) {
+			util::fail("您没有权限");
+		}
+		$adminId = $admin['id'];
+		$currentShopId = $admin['currentShopId'] ?? 0;
+		$sjShopList = ShopClass::getSjShopList($sjId);
+		$sjShopIds = array_column($sjShopList, 'id');
+		if (in_array($toggleShopId, $sjShopIds) == false) {
+			util::fail('不是您的门店');
+		}
+		$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $toggleShopId, 'adminId' => $adminId, 'delStatus' => 0]);
+		if (empty($shopAdmin)) {
+			util::fail('您没有权限哦');
+		}
+		self::updateById($adminId, ['currentShopId' => $toggleShopId]);
+		return $shopAdmin;
+	}
+	
 }

biz-ghs/admin/models/Admin.php

@@ -7,7 +7,7 @@ class Admin extends Base
 
 	public static function tableName()
 	{
-		return 'xhGhsAdmin';
+		return 'xhAdmin';
 	}
 
 }

biz-ghs/admin/models/AdminLog.php

@@ -7,7 +7,7 @@ class AdminLog extends Base
 
 	public static function tableName()
 	{
-		return 'xhGhsAdminLog';
+		return 'xhAdminLog';
 	}
 
 }

biz-ghs/admin/models/AdminRole.php

@@ -7,7 +7,7 @@ class AdminRole extends Base
 	
 	public static function tableName()
 	{
-		return 'xhGhsAdminRole';
+		return 'xhAdminRole';
 	}
 
 }

biz-ghs/admin/models/AdminRoleAuth.php

@@ -7,7 +7,7 @@ class AdminRoleAuth extends Base
 	
 	public static function tableName()
 	{
-		return 'xhGhsAdminRoleAuth';
+		return 'xhAdminRoleAuth';
 	}
 
 }

biz-ghs/merchant/models/Admin.php

@@ -7,7 +7,7 @@ class Admin extends Base
 
 	public static function tableName()
 	{
-		return 'xhGhsAdmin';
+		return 'xhAdmin';
 	}
 
 }

biz/admin/classes/AdminClass.php

@@ -12,391 +12,422 @@ use biz\base\classes\BaseClass;
 
 class AdminClass extends BaseClass
 {
-
-    public static $baseFile = '\biz\admin\models\Admin';
-
-    //收益通知人
-    public static $noticeAdmin = [
-        //国兰
-        'wx193341a4a80f6ea3' => ['o4c8Vs54PQh32nkgG8R3m4VuGTvw', 'o4c8VszacQJyrzu651CAu0sCsfPc'],
-        //花美灵
-        'wx84d95afcb7b594eb' => ['oTFbYvsjwgVwXggwtlM2ESAKwuN8', 'oTFbYvqP6qwdCCkdFB9GYnlzDIUg'],
-    ];
-
-    //补充营业执照时初始化员工
-    public static function supplementAdmin()
-    {
-
-    }
-
-    //开店时初始化员工和角色
-    public static function initAdmin($applyData, $sjId, $shopId)
-    {
-        $adminId = $applyData['adminId'] ?? 0;
-        $mobile = $applyData['mobile'] ?? 0;
-
-        //创建管理员角色
-        $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
-        $roleId = $roleReturn['id'];
-        //创建管理员身份
-        if (!empty($adminId)) {
-            $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
-            if (empty($shopAdmin)) {
-                $adminData = [
-                    'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                    'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
-                    'mobile' => $mobile
-                ];
-                AdminClass::updateById($adminId, $adminData);
-                $shopData = [
-                    'adminId' => $adminId,
-                    'shopId' => $shopId,
-                    'merchantId' => $sjId,
-                    'remind' => 1,
-                    'roleId' => $roleId,
-                    'default' => 1,
-                ];
-                ShopAdminClass::add($shopData);
-            }
-        }
-    }
-
-    //组合员工基本信息 $sensitive = true 表示敏感的，不要输出密码信息 shish 2019.12.9
-    public static function groupAdminBaseInfo($list, $sensitive = true)
-    {
-        $prefix = Yii::$app->params['imgHost'];
-        foreach ($list as $key => $val) {
-            $list[$key]['roleName'] = '';
-            $list[$key]['avatarUrl'] = $prefix . '/retail/default-avatar.png';
-            $list[$key]['addDate'] = date("Y-m-d H:i", $val['addTime']);
-            $list[$key]['lastLoginTime'] = date("Y-m-d H:i", $val['loginTime']);
-            //敏感信息
-            if ($sensitive) {
-                //这里需要输出值secret，否则修改密码那边会有问题
-                $list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
-                $list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
-                $list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
-            }
-        }
-        return $list;
-    }
-
-    //获取员工详情 shish 2019.12.9
-    public static function getDetail($id)
-    {
-        $detail = self::getById($id);
-        if (empty($detail)) {
-            return [];
-        }
-        $list = self::groupAdminBaseInfo([$detail]);
-        return current($list);
-    }
-
-    //获取员工详情 shish 2019.12.9
-    // $sensitive = true 表示敏感的，不要输出密码等信息
-    public static function getAdminById($id, $sensitive = true)
-    {
-        $detail = AdminClass::getById($id);
-        if (empty($detail)) {
-            util::fail('没有找到员工信息！');
-        }
-        $list = self::groupAdminBaseInfo([$detail], $sensitive);
-        return current($list);
-    }
-
-    //添加员工 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);
-        if (empty($admin)) {
-            util::fail('没有找到管理员信息');
-        }
-        $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
-        $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)
-    {
-        if (empty($admin)) {
-            util::fail('员工无效');
-        }
-        if ($admin['merchantId'] != $merchantId) {
-            util::fail('您没有权限操作此员工');
-        }
-    }
-
-    //删除员工，需要考虑权限 shish 2019.12.9
-    public static function deleteAdmin($admin, $adminId)
-    {
-        $id = $admin['id'];
-        if ($admin['super'] == 1) {
-            util::fail('超级管理员不能删除');
-        }
-        if ($id == $adminId) {
-            util::fail('不能删除自己');
-        }
-        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)
-    {
-        $adminInfo = self::switchAdminInfo($adminInfo, $source);
-        $adminSource = UserClass::$userSourceId;
-        $unionId = isset($adminInfo['unionId']) && !empty($adminInfo['unionId']) ? $adminInfo['unionId'] : '';
-        $unionAdmin = [];
-        if (!empty($unionId)) {
-            $unionAdmin = self::getByUnionId($unionId);
-        }
-        switch ($source) {
-            case $adminSource['mini']['name']:
-                $sourceId = $adminSource['mini']['id'];
-                $miniOpenId = $adminInfo['miniOpenId'];
-                $admin = self::getByMiniOpenId($miniOpenId);
-                break;
-            case $adminSource['official']['name']:
-                $sourceId = $adminSource['official']['id'];
-                $openId = isset($adminInfo['openId']) ? $adminInfo['openId'] : '';
-                $admin = [];
-                if (!empty($openId)) {
-                    $admin = self::getByOpenId($openId);
-                }
-                break;
-            default:
-                throw new \Exception('未知来源的用户');
-        }
-        if (empty($admin)) {
-            if (!empty($unionAdmin)) {
-                //1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
-                //2、关注了公众号或者H5已经授权时，并首次访问小程序
-                $admin = self::updateAdmin($unionAdmin, $adminInfo);
-            } else {
-                $adminInfo['sourceType'] = $sourceId;
-                $admin = self::generateAdmin($adminInfo);
-            }
-        } else {
-            if (!empty($unionAdmin)) {
-                if (isset($unionAdmin['id']) && isset($admin['id']) && $admin['id'] != $unionAdmin['id']) {
-                    //合并相同管理员，小程序管理保留，其它删除
-                    $admin = self::mergeAdmin($unionAdmin, $admin);
-                }
-            }
-            $admin = self::updateAdmin($admin, $adminInfo);
-        }
-        return $admin;
-    }
-
-    //更新员工信息 shish 2020.5.30
-    public static function updateAdmin($originalAdmin, $getAdminInfo)
-    {
-        $data = [];
-        $adminId = $originalAdmin['id'];
-        //替换掉微信不支持的图片
-        $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
-        if (!empty($nickName)) {
-            $data['nickName'] = $nickName;
-        }
-        if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
-            $data['adminName'] = $nickName;
-        }
-        if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
-            $openId = $getAdminInfo['openId'];
-            $data['openId'] = $openId;
-        }
-        if (isset($getAdminInfo['miniOpenId']) && !empty($getAdminInfo['miniOpenId'])) {
-            $data['miniOpenId'] = $getAdminInfo['miniOpenId'];
-        }
-        if (isset($getAdminInfo['unionId']) && !empty($getAdminInfo['unionId'])) {
-            $data['unionId'] = $getAdminInfo['unionId'];
-        }
-        if (isset($getAdminInfo['sex'])) {
-            $data['sex'] = $getAdminInfo['sex'];
-        }
-        if (isset($getAdminInfo['subscribe'])) {
-            $data['subscribe'] = $getAdminInfo['subscribe'];
-        }
-        if (isset($getAdminInfo['subscribeTime'])) {
-            $data['subscribeTime'] = $getAdminInfo['subscribeTime'];
-        }
-        if (isset($getAdminInfo['isFull'])) {
-            $data['isFull'] = $getAdminInfo['isFull'];
-        }
-        if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
-            $data['isFull'] = 1;
-        }
-
-        //更新头像
-        $merchantId = 0;
-        if (isset($originalAdmin['avatar']) == false || empty($originalAdmin['avatar'])) {
-            if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
-                $imgUrl = $getAdminInfo['headImgUrl'];
-                $name = ImageService::generateAvatar($merchantId, $imgUrl);
-                if (!empty($name)) {
-                    $data['avatar'] = $name;
-                }
-            }
-        }
-
-        self::updateById($adminId, $data);
-        $admin = self::getById($adminId);
-        return $admin;
-    }
-
-    public static function generateAdmin($getAdminInfo)
-    {
-        $time = time();
-        //替换掉微信名称不支持的图片
-        $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
-        $getAdminInfo['nickName'] = $nickName;
-        $getAdminInfo['adminName'] = $nickName;
-        $subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
-        $getAdminInfo['subscribe'] = $subscribe;
-        $getAdminInfo['avatar'] = '';
-        $getAdminInfo['password'] = '';
-        $getAdminInfo['payPassword'] = '';
-        $getAdminInfo['mobile'] = isset($getAdminInfo['mobile']) ? $getAdminInfo['mobile'] : '';
-        $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);
-            if (!empty($name)) {
-                $getAdminInfo['avatar'] = $name;
-            }
-        }
-
-        $admin = self::add($getAdminInfo);
-        $adminId = $admin['id'];
-        if (empty($nickName)) {
-            self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
-        }
-        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)
-    {
-        $openId = '';
-        if (isset($info['openid']) && !empty($info['openid'])) {
-            $openId = $info['openid'];
-            unset($info['openId']);
-        }
-        if (isset($info['openId']) && !empty($info['openId'])) {
-            $openId = $info['openId'];
-            unset($info['openId']);
-        }
-        if (!empty($openId)) {
-            $adminSource = UserClass::$userSourceId;
-            switch ($source) {
-                case $adminSource['mini']['name']:
-                    $info['miniOpenId'] = $openId;
-                    break;
-                case $adminSource['official']['name']:
-                    $info['openId'] = $openId;
-                    break;
-                default:
-            }
-        }
-        if (isset($info['nickName'])) {
-            $info['nickName'] = $info['nickName'];
-        }
-        if (isset($info['unionid'])) {
-            $info['unionId'] = $info['unionid'];
-        }
-        if (isset($info['unionId'])) {
-            $info['unionId'] = $info['unionId'];
-        }
-        if (isset($info['headimgurl'])) {
-            $info['headImgUrl'] = $info['headimgurl'];
-        }
-        if (isset($info['avatarUrl'])) {
-            $info['headImgUrl'] = $info['avatarUrl'];
-        }
-        if (isset($info['subscribe_time'])) {
-            $info['subscribeTime'] = $info['subscribe_time'];
-        }
-        if (isset($info['subscribe'])) {
-            $info['subscribe'] = $info['subscribe'];
-        }
-        return $info;
-    }
-
-    //取消关注 shish 2020.4.19
-    public static function unFocus($adminId)
-    {
-        self::updateById($adminId, ['subscribe' => 0, 'hasSubscribe' => 1]);
-    }
-
+	
+	public static $baseFile = '\biz\admin\models\Admin';
+	
+	//收益通知人
+	public static $noticeAdmin = [
+		//国兰
+		'wx193341a4a80f6ea3' => ['o4c8Vs54PQh32nkgG8R3m4VuGTvw', 'o4c8VszacQJyrzu651CAu0sCsfPc'],
+		//花美灵
+		'wx84d95afcb7b594eb' => ['oTFbYvsjwgVwXggwtlM2ESAKwuN8', 'oTFbYvqP6qwdCCkdFB9GYnlzDIUg'],
+	];
+	
+	public static function getRecentShop($admin)
+	{
+		$recent = $admin['recentShop'];
+		$arr = [];
+		if (!empty($recent)) {
+			$ids = json_decode($recent, true);
+			$list = self::getAdminByIds($ids);
+			if (!empty($list)) {
+				foreach ($list as $key => $val) {
+					$arr[] = [
+						'shopId' => $val['id'],
+						'shopName' => $val['shopName'],
+						'shopImg' => $val['avatar'],
+					];
+				}
+			}
+		}
+		return $arr;
+	}
+
+	//增加最近访问的门店 shish 2021.3.1
+	public static function addRecentShop($lookShopId, $admin)
+	{
+		if (empty($lookShopId)) {
+			return false;
+		}
+		$hasRecentShop = $admin['recentShop'];
+		$adminId = $admin['id'];
+		$newShopIds = [];
+		if (!empty($hasRecentShop)) {
+			$newShopIds = josn_decode($hasRecentShop, true);
+		}
+		$newShopIds = array_merge($newShopIds, [$lookShopId]);
+		$newShopIds = array_unique(array_filter($newShopIds));
+		self::updateById($adminId, ['recentShop' => json_encode($newShopIds)]);
+	}
+	
+	//开店时初始化员工和角色
+	public static function initAdmin($applyData, $sjId, $shopId)
+	{
+		$adminId = $applyData['adminId'] ?? 0;
+		$mobile = $applyData['mobile'] ?? 0;
+		
+		//创建管理员角色
+		$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
+		$roleId = $roleReturn['id'];
+		//创建管理员身份
+		if (!empty($adminId)) {
+			$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
+			if (empty($shopAdmin)) {
+				$adminData = [
+					'password' => password_hash($mobile, PASSWORD_BCRYPT),
+					'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
+					'mobile' => $mobile
+				];
+				AdminClass::updateById($adminId, $adminData);
+				$shopData = [
+					'adminId' => $adminId,
+					'shopId' => $shopId,
+					'merchantId' => $sjId,
+					'remind' => 1,
+					'roleId' => $roleId,
+					'default' => 1,
+				];
+				ShopAdminClass::add($shopData);
+			}
+		}
+	}
+	
+	//组合员工基本信息 $sensitive = true 表示敏感的，不要输出密码信息 shish 2019.12.9
+	public static function groupAdminBaseInfo($list, $sensitive = true)
+	{
+		$prefix = Yii::$app->params['imgHost'];
+		foreach ($list as $key => $val) {
+			$list[$key]['roleName'] = '';
+			$list[$key]['avatarUrl'] = $prefix . '/retail/default-avatar.png';
+			$list[$key]['addDate'] = date("Y-m-d H:i", $val['addTime']);
+			$list[$key]['lastLoginTime'] = date("Y-m-d H:i", $val['loginTime']);
+			//敏感信息
+			if ($sensitive) {
+				//这里需要输出值secret，否则修改密码那边会有问题
+				$list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
+				$list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
+				$list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
+			}
+		}
+		return $list;
+	}
+	
+	//获取员工详情 shish 2019.12.9
+	public static function getDetail($id)
+	{
+		$detail = self::getById($id);
+		if (empty($detail)) {
+			return [];
+		}
+		$list = self::groupAdminBaseInfo([$detail]);
+		return current($list);
+	}
+	
+	//获取员工详情 shish 2019.12.9
+	// $sensitive = true 表示敏感的，不要输出密码等信息
+	public static function getAdminById($id, $sensitive = true)
+	{
+		$detail = AdminClass::getById($id);
+		if (empty($detail)) {
+			util::fail('没有找到员工信息！');
+		}
+		$list = self::groupAdminBaseInfo([$detail], $sensitive);
+		return current($list);
+	}
+	
+	//添加员工 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);
+		if (empty($admin)) {
+			util::fail('没有找到管理员信息');
+		}
+		$data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
+		$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)
+	{
+		if (empty($admin)) {
+			util::fail('员工无效');
+		}
+		if ($admin['merchantId'] != $merchantId) {
+			util::fail('您没有权限操作此员工');
+		}
+	}
+	
+	//删除员工，需要考虑权限 shish 2019.12.9
+	public static function deleteAdmin($admin, $adminId)
+	{
+		$id = $admin['id'];
+		if ($admin['super'] == 1) {
+			util::fail('超级管理员不能删除');
+		}
+		if ($id == $adminId) {
+			util::fail('不能删除自己');
+		}
+		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)
+	{
+		$adminInfo = self::switchAdminInfo($adminInfo, $source);
+		$adminSource = UserClass::$userSourceId;
+		$unionId = isset($adminInfo['unionId']) && !empty($adminInfo['unionId']) ? $adminInfo['unionId'] : '';
+		$unionAdmin = [];
+		if (!empty($unionId)) {
+			$unionAdmin = self::getByUnionId($unionId);
+		}
+		switch ($source) {
+			case $adminSource['mini']['name']:
+				$sourceId = $adminSource['mini']['id'];
+				$miniOpenId = $adminInfo['miniOpenId'];
+				$admin = self::getByMiniOpenId($miniOpenId);
+				break;
+			case $adminSource['official']['name']:
+				$sourceId = $adminSource['official']['id'];
+				$openId = isset($adminInfo['openId']) ? $adminInfo['openId'] : '';
+				$admin = [];
+				if (!empty($openId)) {
+					$admin = self::getByOpenId($openId);
+				}
+				break;
+			default:
+				throw new \Exception('未知来源的用户');
+		}
+		if (empty($admin)) {
+			if (!empty($unionAdmin)) {
+				//1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
+				//2、关注了公众号或者H5已经授权时，并首次访问小程序
+				$admin = self::updateAdmin($unionAdmin, $adminInfo);
+			} else {
+				$adminInfo['sourceType'] = $sourceId;
+				$admin = self::generateAdmin($adminInfo);
+			}
+		} else {
+			if (!empty($unionAdmin)) {
+				if (isset($unionAdmin['id']) && isset($admin['id']) && $admin['id'] != $unionAdmin['id']) {
+					//合并相同管理员，小程序管理保留，其它删除
+					$admin = self::mergeAdmin($unionAdmin, $admin);
+				}
+			}
+			$admin = self::updateAdmin($admin, $adminInfo);
+		}
+		return $admin;
+	}
+	
+	//更新员工信息 shish 2020.5.30
+	public static function updateAdmin($originalAdmin, $getAdminInfo)
+	{
+		$data = [];
+		$adminId = $originalAdmin['id'];
+		//替换掉微信不支持的图片
+		$nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
+		if (!empty($nickName)) {
+			$data['nickName'] = $nickName;
+		}
+		if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
+			$data['adminName'] = $nickName;
+		}
+		if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
+			$openId = $getAdminInfo['openId'];
+			$data['openId'] = $openId;
+		}
+		if (isset($getAdminInfo['miniOpenId']) && !empty($getAdminInfo['miniOpenId'])) {
+			$data['miniOpenId'] = $getAdminInfo['miniOpenId'];
+		}
+		if (isset($getAdminInfo['unionId']) && !empty($getAdminInfo['unionId'])) {
+			$data['unionId'] = $getAdminInfo['unionId'];
+		}
+		if (isset($getAdminInfo['sex'])) {
+			$data['sex'] = $getAdminInfo['sex'];
+		}
+		if (isset($getAdminInfo['subscribe'])) {
+			$data['subscribe'] = $getAdminInfo['subscribe'];
+		}
+		if (isset($getAdminInfo['subscribeTime'])) {
+			$data['subscribeTime'] = $getAdminInfo['subscribeTime'];
+		}
+		if (isset($getAdminInfo['isFull'])) {
+			$data['isFull'] = $getAdminInfo['isFull'];
+		}
+		if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
+			$data['isFull'] = 1;
+		}
+		
+		//更新头像
+		$merchantId = 0;
+		if (isset($originalAdmin['avatar']) == false || empty($originalAdmin['avatar'])) {
+			if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
+				$imgUrl = $getAdminInfo['headImgUrl'];
+				$name = ImageService::generateAvatar($merchantId, $imgUrl);
+				if (!empty($name)) {
+					$data['avatar'] = $name;
+				}
+			}
+		}
+		
+		self::updateById($adminId, $data);
+		$admin = self::getById($adminId);
+		return $admin;
+	}
+	
+	public static function generateAdmin($getAdminInfo)
+	{
+		$time = time();
+		//替换掉微信名称不支持的图片
+		$nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
+		$getAdminInfo['nickName'] = $nickName;
+		$getAdminInfo['adminName'] = $nickName;
+		$subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
+		$getAdminInfo['subscribe'] = $subscribe;
+		$getAdminInfo['avatar'] = '';
+		$getAdminInfo['password'] = '';
+		$getAdminInfo['payPassword'] = '';
+		$getAdminInfo['mobile'] = isset($getAdminInfo['mobile']) ? $getAdminInfo['mobile'] : '';
+		$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);
+			if (!empty($name)) {
+				$getAdminInfo['avatar'] = $name;
+			}
+		}
+		
+		$admin = self::add($getAdminInfo);
+		$adminId = $admin['id'];
+		if (empty($nickName)) {
+			self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
+		}
+		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)
+	{
+		$openId = '';
+		if (isset($info['openid']) && !empty($info['openid'])) {
+			$openId = $info['openid'];
+			unset($info['openId']);
+		}
+		if (isset($info['openId']) && !empty($info['openId'])) {
+			$openId = $info['openId'];
+			unset($info['openId']);
+		}
+		if (!empty($openId)) {
+			$adminSource = UserClass::$userSourceId;
+			switch ($source) {
+				case $adminSource['mini']['name']:
+					$info['miniOpenId'] = $openId;
+					break;
+				case $adminSource['official']['name']:
+					$info['openId'] = $openId;
+					break;
+				default:
+			}
+		}
+		if (isset($info['nickName'])) {
+			$info['nickName'] = $info['nickName'];
+		}
+		if (isset($info['unionid'])) {
+			$info['unionId'] = $info['unionid'];
+		}
+		if (isset($info['unionId'])) {
+			$info['unionId'] = $info['unionId'];
+		}
+		if (isset($info['headimgurl'])) {
+			$info['headImgUrl'] = $info['headimgurl'];
+		}
+		if (isset($info['avatarUrl'])) {
+			$info['headImgUrl'] = $info['avatarUrl'];
+		}
+		if (isset($info['subscribe_time'])) {
+			$info['subscribeTime'] = $info['subscribe_time'];
+		}
+		if (isset($info['subscribe'])) {
+			$info['subscribe'] = $info['subscribe'];
+		}
+		return $info;
+	}
+	
+	//取消关注 shish 2020.4.19
+	public static function unFocus($adminId)
+	{
+		self::updateById($adminId, ['subscribe' => 0, 'hasSubscribe' => 1]);
+	}
+	
 }

sql.sql

@@ -1286,4 +1286,12 @@ ALTER TABLE xhApply ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AF
 ALTER TABLE xhGhsCustom ADD `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '拼音首字母' AFTER `name`;
 ALTER TABLE xhCustom ADD `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '拼音首字母' AFTER `name`;
 ALTER TABLE xhGhsOrder ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AFTER `adminId`;
-ALTER TABLE xhGhsOrder MODIFY `adminId` INT(11) NOT NULL DEFAULT '0' COMMENT '用户id';
+ALTER TABLE xhGhsOrder MODIFY `adminId` INT(11) NOT NULL DEFAULT '0' COMMENT '用户id';
+DROP TABLE IF EXISTS xhAdmin;
+DROP TABLE IF EXISTS xhAdminRole;
+DROP TABLE IF EXISTS xhAdminRoleAuth;
+DROP TABLE IF EXISTS xhAdminLog;
+ALTER TABLE xhGhsAdmin RENAME TO xhAdmin;
+ALTER TABLE xhGhsAdminRole RENAME TO xhAdminRole;
+ALTER TABLE xhGhsAdminRoleAuth RENAME TO xhAdminRoleAuth;
+ALTER TABLE xhGhsAdminLog RENAME TO xhAdminLog;