소스 검색

增加供货商 admin

shish 5 년 전
부모
커밋
a760c7a4ae

+ 2 - 2
app/ghs/controllers/AuthController.php

@@ -192,12 +192,12 @@ class AuthController extends PublicController
         noticeUtil::push('小程序授权参数:'.stringUtil::paramsFriend($arr),'15280215347');
         $sessionKey = isset($arr['session_key']) ? $arr['session_key'] : '';
         $openid = isset($arr['openid']) ? $arr['openid'] : '';
-        $cacheKey = 'SHOP_MINI_SESSION_KEY_' . $openid;
-        Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
         if (empty($openid)) {
             Yii::info(json_encode($arr));
             util::fail('没有获取到小程序openId');
         }
+        $cacheKey = 'SHOP_MINI_SESSION_KEY_' . $openid;
+        Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
         //用户来源
         $userSource = UserClass::$userSourceId['mini']['name'];
         $admin = AdminService::getByMiniOpenId($openid);

+ 362 - 0
biz-ghs/admin/classes/AdminClass.php

@@ -0,0 +1,362 @@
+<?php
+
+namespace bizGhs\admin\classes;
+
+use bizGhs\user\classes\UserClass;
+use common\components\util;
+use common\services\ImageService;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class AdminClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\admin\models\Admin';
+	
+	//收益通知人
+	public static $noticeAdmin = [
+		//国兰
+		'wx193341a4a80f6ea3' => ['o4c8Vs54PQh32nkgG8R3m4VuGTvw', 'o4c8VszacQJyrzu651CAu0sCsfPc'],
+		//花美灵
+		'wx84d95afcb7b594eb' => ['oTFbYvsjwgVwXggwtlM2ESAKwuN8', 'oTFbYvqP6qwdCCkdFB9GYnlzDIUg'],
+	];
+	
+	//组合员工基本信息 shish 2019.12.9
+	public static function groupAdminBaseInfo($list, $sensitive = true)
+	{
+		$prefix = Yii::$app->params['imgHost'];
+		foreach ($list as $key => $val) {
+			$roleId = 0;
+			$list[$key]['roleName'] = '';
+			$list[$key]['avatarUrl'] = Yii::$app->params['imgHost'] . '/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)) {
+			util::fail('没有找到员工信息' . $id . '|');
+		}
+		$list = self::groupAdminBaseInfo([$detail]);
+		return current($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 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]);
+	}
+	
+}

+ 31 - 0
biz-ghs/admin/classes/AdminLogClass.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace bizGhs\admin\classes;
+
+use bizGhs\admin\services\AdminRoleService;
+use bizGhs\user\classes\UserClass;
+use bizGhs\user\services\UserService;
+use common\components\util;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class AdminLogClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\admin\models\AdminLog';
+	
+	public static function groupBaseInfo($list)
+	{
+		$adminIdList = array_column($list, 'adminId');
+		$adminIdList = array_unique(array_filter($adminIdList));
+		$adminList = AdminClass::getByIds($adminIdList, null, 'id');
+		foreach ($list as $key => $val) {
+			$adminId = $val['adminId'];
+			$ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
+			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['adminName'] : '';
+			$list[$key]['ip'] = $ip;
+		}
+		return $list;
+	}
+
+}

+ 13 - 0
biz-ghs/admin/classes/AdminRoleAuthClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\admin\classes;
+
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class AdminRoleAuthClass extends BaseClass
+{
+
+	public static $baseFile = '\biz\admin\models\AdminRoleAuth';
+
+}

+ 83 - 0
biz-ghs/admin/classes/AdminRoleClass.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace bizGhs\admin\classes;
+
+use common\components\util;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class AdminRoleClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\admin\models\AdminRole';
+	
+	//验证权限 shish 2019.12.9
+	public static function valid($role, $merchantId)
+	{
+		if (empty($role)) {
+			util::fail('角色无效');
+		}
+		if ($role['merchantId'] != $merchantId) {
+			util::fail('没有权限操作');
+		}
+	}
+	
+	//添加角色 shish 2019.12.10
+	public static function addRole($data)
+	{
+		$roleName = $data['roleName'];
+		$merchantId = $data['merchantId'];
+		$nameList = self::getNameList($merchantId);
+		if (in_array($roleName, $nameList)) {
+			util::fail('角色已经存在');
+		}
+		$data['addTime'] = time();
+		return self::add($data);
+	}
+	
+	//获取商家角色列表 shish 2019.12.10
+	public static function getRoleList($merchantId)
+	{
+		$where = ['merchantId' => $merchantId, 'delStatus' => 0];
+		return self::getList('*', $where, 'addTime DESC');
+	}
+
+	//获取商家所有的角色名称 shish 2019.12.10
+	public static function getNameList($merchantId)
+	{
+		$list = self::getRoleList($merchantId);
+		return !empty($list) ? array_column($list, 'roleName') : [];
+	}
+	
+	//更新角色 shish 2019.12.10
+	public static function updateRole($role, $data)
+	{
+		$merchantId = $role['merchantId'];
+		if ($role['roleName'] != $data['roleName']) {
+			$name = $data['roleName'];
+			$nameList = self::getNameList($merchantId);
+			if (in_array($name, $nameList)) {
+				util::fail('名称已经存在');
+			}
+		}
+		$id = $role['id'];
+		return self::updateById($id, $data);
+	}
+	
+	//删除角色 shish 2019.12.10
+	public static function deleteRole($role)
+	{
+		if (isset($role['num']) && !empty($role['num'])) {
+			util::fail('还有成员,不能删除');
+		}
+		$id = $role['id'];
+		return self::updateById($id, ['delStatus' => 1]);
+	}
+	
+	//创建管理员角色 shish 2020.2.8
+	public static function addAdminRole($data)
+	{
+		return self::add($data);
+	}
+	
+}

+ 77 - 0
biz-ghs/admin/classes/ShopAdminClass.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace bizGhs\admin\classes;
+
+use bizGhs\user\classes\UserClass;
+use common\components\util;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class ShopAdminClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\admin\models\ShopAdmin';
+	
+	const GENERATE_ADMIN_DATA = 'generate_admin_data_';//创建管理员需要的数据
+	
+	//创建管理准备数据key shish 2020.4.17
+	public static function getGenerateAdminDataKey($shopId, $adminId)
+	{
+		return self::GENERATE_ADMIN_DATA . $shopId . '_' . $adminId;
+	}
+	
+	//创建管理员数据准备 shish 2020.4.17
+	public static function prepareBindAdmin($data)
+	{
+		$adminId = $data['adminId'];
+		$shopId = $data['shopId'];
+		$cacheKey = self::getGenerateAdminDataKey($shopId, $adminId);
+		$params = [$cacheKey];
+		if (!empty($data)) {
+			foreach ($data as $key => $val) {
+				if (!is_array($val)) {
+					$params[] = $key;
+					$params[] = $val;
+				}
+			}
+		}
+		Yii::$app->redis->executeCommand('HMSET', $params);
+	}
+	
+	//获取创建管理员需要的信息 shish 2020.4.20
+	public static function getBindAdminData($shopId, $adminId)
+	{
+		$cacheKey = self::getGenerateAdminDataKey($shopId, $adminId);
+		$cacheData = Yii::$app->redis->executeCommand('HGETALL', [$cacheKey]);
+		$data = [];
+		if (!empty($cacheData)) {
+			$data = [];
+			$list = [];
+			$x = 0;
+			foreach ($cacheData as $cKey => $cVal) {
+				if ($cKey % 2 == 0) {
+					$list[$x]['key'] = $cVal;
+				} else {
+					$list[$x]['value'] = $cVal;
+					$x++;
+				}
+			}
+			foreach ($list as $lKey => $lVal) {
+				$data[$lVal['key']] = $lVal['value'];
+			}
+		}
+		return $data;
+	}
+
+	//删除创建管理员需要的信息 shish 2020.4.20
+	public static function delBindAdminData($shopId, $adminId)
+	{
+		$cacheKey = self::getGenerateAdminDataKey($shopId, $adminId);
+		$keyNameList = Yii::$app->redis->executeCommand('HKEYS', [$cacheKey]);
+		if (!empty($keyNameList)) {
+			$data = array_merge([$cacheKey], $keyNameList);
+			$cacheData = Yii::$app->redis->executeCommand('HDEL', $data);
+		}
+	}
+
+}

+ 13 - 0
biz-ghs/admin/models/Admin.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\admin\models;
+use bizGhs\base\models\Base;
+
+class Admin extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhGhsAdmin';
+	}
+
+}

+ 13 - 0
biz-ghs/admin/models/AdminLog.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\admin\models;
+use bizGhs\base\models\Base;
+
+class AdminLog extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhAdminLog';
+	}
+
+}

+ 13 - 0
biz-ghs/admin/models/AdminRole.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\admin\models;
+use bizGhs\base\models\Base;
+
+class AdminRole extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhAdminRole';
+	}
+
+}

+ 13 - 0
biz-ghs/admin/models/AdminRoleAuth.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\admin\models;
+use bizGhs\base\models\Base;
+
+class AdminRoleAuth extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhAdminRoleAuth';
+	}
+
+}

+ 15 - 0
biz-ghs/admin/models/ShopAdmin.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizGhs\admin\models;
+
+use bizGhs\base\models\Base;
+
+class ShopAdmin extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhShopAdmin';
+	}
+	
+}

+ 33 - 0
biz-ghs/admin/services/AdminLogService.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace bizGhs\admin\services;
+
+use bizGhs\admin\classes\AdminClass;
+use bizGhs\admin\classes\AdminLogClass;
+use bizGhs\auth\services\AuthService;
+use bizGhs\base\services\BaseService;
+use bizGhs\merchant\services\MerchantService;
+use common\components\error;
+use common\components\stringUtil;
+use common\components\util;
+use common\services\xhTMessageService;
+use Yii;
+
+class AdminLogService extends BaseService
+{
+
+	public static $baseFile = '\biz\admin\classes\AdminLogClass';
+
+	//获取客户列表 shish 2019.11.30
+	public static function getLogList($where)
+	{
+		$data = AdminLogClass::getList('*', $where, 'addTime DESC');
+		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+		if (empty($list)) {
+			return $data;
+		}
+		$data['list'] = AdminLogClass::groupBaseInfo($list);
+		return $data;
+	}
+
+}

+ 30 - 0
biz-ghs/admin/services/AdminRoleAuthService.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace bizGhs\admin\services;
+
+use bizGhs\base\services\BaseService;
+use common\components\util;
+use Yii;
+
+class AdminRoleAuthService extends BaseService
+{
+
+    public static $baseFile = '\biz\admin\classes\AdminRoleAuthClass';
+
+    //角色在业务端的权限 shish 2019.11.25
+    public static function getAuthIdList($roleId, $endId)
+    {
+        $info = self::getByCondition(['roleId' => $roleId, 'endId' => $endId]);
+        $auth = isset($info['auth']) ? $info['auth'] : '';
+        $ids = !empty($auth) ? explode(',', $auth) : [];
+        return $ids;
+    }
+
+    public static function valid($auth, $merchantId)
+    {
+        if (isset($auth['merchantId']) == false || $auth['merchantId'] != $merchantId) {
+            util::fail('您没有权限操作');
+        }
+    }
+
+}

+ 43 - 0
biz-ghs/admin/services/AdminRoleService.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace bizGhs\admin\services;
+
+use bizGhs\admin\classes\AdminRoleClass;
+use bizGhs\base\services\BaseService;
+use Yii;
+
+class AdminRoleService extends BaseService
+{
+	
+	public static $baseFile = '\biz\admin\classes\AdminRoleClass';
+	
+	public static function valid($role, $merchantId)
+	{
+		return AdminRoleClass::valid($role, $merchantId);
+	}
+	
+	//角色列表 shish 2019.12.9
+	public static function getRoleList($merchantId)
+	{
+		return AdminRoleClass::getRoleList($merchantId);
+	}
+	
+	//添加角色 shish 2019.12.10
+	public static function addRole($data)
+	{
+		return AdminRoleClass::addRole($data);
+	}
+	
+	//修改角色 shish 2019.12.10
+	public static function updateRole($role, $data)
+	{
+		return AdminRoleClass::updateRole($role, $data);
+	}
+	
+	//删除角色 shish 2019.12.10
+	public static function deleteRole($role)
+	{
+		return AdminRoleClass::deleteRole($role);
+	}
+	
+}

+ 150 - 0
biz-ghs/admin/services/AdminService.php

@@ -0,0 +1,150 @@
+<?php
+
+namespace bizGhs\admin\services;
+
+use bizGhs\admin\classes\AdminClass;
+use bizGhs\auth\services\AuthService;
+use bizGhs\base\services\BaseService;
+use bizGhs\merchant\services\MerchantService;
+use bizGhs\user\services\UserService;
+use common\components\error;
+use common\components\stringUtil;
+use common\components\util;
+use common\services\xhTMessageService;
+use Yii;
+
+class AdminService extends BaseService
+{
+
+    public static $baseFile = '\biz\admin\classes\AdminClass';
+
+    public static function generateSessionId($account)
+    {
+        return 'SID_HT_' . $account . '_' . date("mdHis") . '_' . stringUtil::charsShuffle(18);
+    }
+
+    public static function verifyConfirmPassword($adminId, $password)
+    {
+        $admin = AdminClass::getById($adminId);
+        $hash = isset($admin['confirmPassword']) ? $admin['confirmPassword'] : '';
+        if (password_verify($password, $hash) == false) {
+            util::fail('密码错误');
+        }
+    }
+
+    //发送到手机上 shish 2019.8.11
+    public static function sendUrlToMobile($url, $merchant)
+    {
+        $class = self::$baseFile;
+        $noticeAdminList = $class::$noticeAdmin;
+        $appId = $merchant['wxAppId'];
+        $openId = isset($noticeAdminList[$appId][0]) ? $noticeAdminList[$appId][0] : '';
+        if (empty($openId)) {
+            error::instance()->setError('没有设置通知人');
+            return false;
+        }
+        xhTMessageService::sendUrlToMobile($url, $openId, $merchant);
+        return true;
+    }
+
+    //员工获取权限 shish 2019.11.25
+    public static function getAuth($adminId, $merchantId)
+    {
+        $admin = self::getById($adminId);
+        $roleId = isset($admin['roleId']) ? $admin['roleId'] : 0;
+        if (empty($roleId)) {
+            return [['endId' => 1, 'endName' => '零售', 'frontUrl' => [], 'backUrl' => []]];
+        }
+        //零售端
+        $endId = 1;
+
+        //商家在业务端的权限
+        $merchantIdList = MerchantService::getAuthIdList($merchantId, $endId);
+        if (empty($merchantIdList)) {
+            return [['endId' => 1, 'endName' => '零售', 'frontUrl' => [], 'backUrl' => []]];
+        }
+
+        //角色在业务端的权限
+        $roleIdList = AdminRoleAuthService::getAuthIdList($roleId, $endId);
+        if (empty($roleIdList)) {
+            return [['endId' => 1, 'endName' => '零售', 'front' => [], 'back' => []]];
+        }
+        $commonIdList = in_array('*', $roleIdList) ? $merchantIdList : array_intersect($roleIdList, $merchantIdList);
+
+        $all = AuthService::getByIds($commonIdList);
+
+        $front = array_column($all, 'frontUrl');
+        $back = array_column($all, 'backUrl');
+        return [['endId' => 1, 'endName' => '零售', 'frontUrl' => $front, 'backUrl' => []]];
+    }
+
+    //员工列表 shish 2019.12.9
+    public static function getAdminList($where)
+    {
+        $data = AdminClass::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+        $data['list'] = AdminClass::groupAdminBaseInfo($list);
+        return $data;
+    }
+
+    //添加员工
+    public static function addAdmin($data)
+    {
+        return AdminClass::addAdmin($data);
+    }
+
+    public static function updateAdmin($admin, $post)
+    {
+        return AdminClass::updateAdmin($admin, $post);
+    }
+
+    //获取员工信息 shish 2019.12.8
+    public static function getDetail($id)
+    {
+        return AdminClass::getDetail($id);
+    }
+
+    //获取员工信息 shish 2019.12.8
+    public static function getAdminById($id)
+    {
+        return AdminClass::getAdminById($id);
+    }
+
+    //考虑权限情况下删除员工 shish 2019.12.9
+    public static function deleteAdmin($admin, $adminId)
+    {
+        return AdminClass::deleteAdmin($admin, $adminId);
+    }
+
+    //验证权限 shish 2019.12.9
+    public static function valid($admin, $merchantId)
+    {
+        return AdminClass::valid($admin, $merchantId);
+    }
+
+    public static function getByMiniOpenId($miniOpenId)
+    {
+        return AdminClass::getByMiniOpenId($miniOpenId);
+    }
+
+    public static function getByOpenId($openId)
+    {
+        return AdminClass::getByOpenId($openId);
+    }
+
+    //添加更新客户 shish 2020.2.7
+    public static function replaceAdmin($adminInfo, $source)
+    {
+        return AdminClass::replaceAdmin($adminInfo, $source);
+    }
+
+    //取消关注 shish 2020.4.19
+    public static function unFocus($adminId)
+    {
+        return AdminClass::unFocus($adminId);
+    }
+
+}

+ 143 - 0
biz-ghs/admin/services/ShopAdminService.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace bizGhs\admin\services;
+
+use bizGhs\admin\classes\AdminClass;
+use bizGhs\admin\classes\AdminRoleClass;
+use bizGhs\admin\classes\ShopAdminClass;
+use bizGhs\auth\services\AuthService;
+use bizGhs\base\services\BaseService;
+use bizGhs\merchant\classes\ShopClass;
+use bizGhs\merchant\services\MerchantService;
+use bizGhs\user\services\UserService;
+use common\components\error;
+use common\components\miniUtil;
+use common\components\stringUtil;
+use common\components\util;
+use common\components\wxUtil;
+use common\services\xhTMessageService;
+use Yii;
+
+class ShopAdminService extends BaseService
+{
+	
+	public static $baseFile = '\biz\admin\classes\ShopAdminClass';
+	
+	///创建管理员生成小程序 shish 2020.4.17
+	public static function prepareBindAdmin($data)
+	{
+		ShopAdminClass::prepareBindAdmin($data);
+		$page = 'admin/shopAdmin/bind';
+		$isOpen = 1;
+		$adminId = $data['adminId'];
+		$shopId = $data['shopId'];
+		$scene = 'adminId=' . $adminId . '&shopId=' . $shopId;
+		$merchant = $data['merchant'];
+		$imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
+		return ['miniCode' => $imgUrl];
+	}
+	
+	public static function generateAdmin($data)
+	{
+		$recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;
+		$mobile = isset($data['mobile']) ? $data['mobile'] : '';
+		$shopId = isset($data['shopId']) ? $data['shopId'] : 0;
+		$adminId = isset($data['adminId']) ? $data['adminId'] : 0;
+		$bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
+		$shop = ShopClass::getById($shopId);
+		if (empty($shop)) {
+			util::fail('没有找到门店');
+		}
+		$merchantId = isset($shop['merchantId']) ? $shop['merchantId'] : 0;
+		if (empty($bindData)) {
+			util::fail('小程序码已经失效,请重新创建员工');
+		}
+		$shopAdmin = ShopAdminClass::getByCondition(['adminId' => $adminId, 'shopId' => $shopId]);
+		if (!empty($shopAdmin)) {
+			util::fail('您已经是管理员了');
+		}
+		$adminName = isset($bindData['adminName']) ? $bindData['adminName'] : '';
+		if (isset($bindData['roleId']) == false || empty($bindData['roleId'])) {
+			util::fail('添加管理员时请选择角色');
+		}
+		$admin = AdminClass::getById($adminId);
+		if (empty($admin)) {
+			util::fail('没有找到管理员信息');
+		}
+		if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
+			util::fail("请关注公众号({$admin['id']})");
+		}
+		$roleId = $bindData['roleId'];
+		$remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
+		$status = isset($bindData['status']) ? $bindData['status'] : 0;
+		$password = isset($bindData['password']) ? password_hash($bindData['password'], PASSWORD_BCRYPT) : '';
+		$remark = isset($bindData['remark']) ? $bindData['remark'] : '';
+		$update = ['adminName' => $adminName, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark];
+		AdminClass::updateById($adminId, $update);
+		$addData = [
+			'adminId' => $adminId,
+			'shopId' => $shopId,
+			'roleId' => $roleId,
+			'remind' => $remind,
+			'status' => $status,
+			'merchantId' => $merchantId,
+		];
+		ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
+		return ShopAdminClass::add($addData);
+	}
+	
+	//获取管理员 shish 2020.4.21
+	// $sensitive true 密码等敏感信息不显示
+	public static function getAdminList($where, $sensitive = true)
+	{
+		$data = ShopAdminClass::getList('*', $where, 'addTime DESC');
+		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+		if (empty($list)) {
+			return $data;
+		}
+		
+		//管理员基础信息
+		$ids = array_column($list, 'adminId');
+		$adminInfo = AdminClass::getByIds($ids, null, 'id');
+		$adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo, $sensitive);
+		
+		$roleIds = array_column($list, 'roleId');
+		$roleIds = array_filter(array_unique($roleIds));
+		$roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
+		
+		foreach ($list as $key => $val) {
+			$adminId = $val['adminId'];
+			$current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
+			$list[$key]['adminBaseInfo'] = $current;
+			$roleId = $val['roleId'];
+			$roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
+			$list[$key]['roleName'] = $roleName;
+		}
+		$data['list'] = $list;
+		return $data;
+	}
+	
+	//获取要通知的管理员 shish 2020.4.28
+	public static function getNoticeAdminList($shopId)
+	{
+		$where = ['shopId' => $shopId];
+		$respond = self::getAdminList($where, false);
+		$list = isset($respond['list']) ? $respond['list'] : [];
+		if (!empty($list)) {
+			foreach ($list as $key => $val) {
+				if (isset($val['remind']) && $val['remind'] == 0) {
+					unset($list[$key]);
+				}
+			}
+		}
+		return $list;
+	}
+	
+	public static function valid($shopAdmin, $shopId)
+	{
+		if (isset($shopAdmin['shopId']) == false || $shopAdmin['shopId'] != $shopId) {
+			util::fail('不是您的员工');
+		}
+	}
+	
+}

+ 27 - 1
sql.sql

@@ -116,4 +116,30 @@ ALTER TABLE xhMerchant ADD `style` TINYINT NOT NULL DEFAULT 0 COMMENT '商家类
 ALTER TABLE xhWxOpen MODIFY wx_mini_base_id INT(11) NOT NULL DEFAULT '0' COMMENT '平台零售商小程序';
 ALTER TABLE xhWxOpen MODIFY wx_base_id INT(11) NOT NULL DEFAULT '0' COMMENT '平台零售商公众号';
 ALTER TABLE xhWxOpen ADD wxGhsMiniBaseId INT(11) NOT NULL DEFAULT '0' COMMENT '平台供货商小程序' AFTER wx_base_id;
-ALTER TABLE xhWxOpen ADD wxGhsBaseId INT(11) NOT NULL DEFAULT '0' COMMENT '平台供货商公众号' AFTER wxGhsMiniBaseId;
+ALTER TABLE xhWxOpen ADD wxGhsBaseId INT(11) NOT NULL DEFAULT '0' COMMENT '平台供货商公众号' AFTER wxGhsMiniBaseId;
+DROP TABLE IF EXISTS `xhGhsAdmin`;
+CREATE TABLE IF NOT EXISTS `xhGhsAdmin` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `mobile` varchar(15) DEFAULT NULL COMMENT '手机号',
+  `identity` tinyint(4) NOT NULL DEFAULT '0' COMMENT '身份 0未知 1花粉 2花店员工',
+  `adminName` varchar(50) NOT NULL DEFAULT '' COMMENT '管理员姓名',
+  `nickName` varchar(50) NOT NULL DEFAULT '' COMMENT '昵称',
+  `avatar` varchar(500) NOT NULL DEFAULT '' COMMENT '头像',
+  `password` varchar(500) NOT NULL DEFAULT '' COMMENT '密码',
+  `confirmPassword` varchar(500) NOT NULL DEFAULT '' COMMENT '确认密码',
+  `sourceType` tinyint(4) NOT NULL DEFAULT '0' COMMENT '来源 0微信 1支付宝 2小程序 3朋友圈 4美团',
+  `subscribeTime` int(11) NOT NULL DEFAULT '0' COMMENT '关注时间',
+  `hasSubscribe` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否关注过 0没有 1是的',
+  `subscribe` tinyint(4) NOT NULL DEFAULT '0' COMMENT '关注平台 0未关注 1关注',
+  `unionId` varchar(100) NOT NULL DEFAULT '' COMMENT '微信平台唯一id',
+  `miniOpenId` varchar(100) NOT NULL DEFAULT '' COMMENT '小程序openid',
+  `openId` varchar(100) NOT NULL DEFAULT '' COMMENT '微信openid',
+  `remark` varchar(500) NOT NULL DEFAULT '' COMMENT '员工备注',
+  `sex` tinyint(4) NOT NULL DEFAULT '0' COMMENT '性别 0未知 1男性 2女性',
+  `super` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否超级管理员 0不是 1是,超级员工不可删除',
+  `delStatus` tinyint(4) NOT NULL DEFAULT '0' COMMENT '软删除标识 0未删除 1已删除',
+  `accountStatus` tinyint(4) NOT NULL DEFAULT '1' COMMENT '帐号状态 0禁用 1正常',
+  `loginTime` int(11) NOT NULL DEFAULT '0' COMMENT '最后登陆时间',
+  `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+  PRIMARY KEY (`id`)
+)COMMENT='供货商管理员表';