员工头像

biz-ghs/admin/classes/AdminClass.php

@@ -12,353 +12,355 @@ 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;
-
-    //组合员工基本信息 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 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]);
-    }
-
+	public static $baseFile = '\bizGhs\admin\models\Admin';
+
+	//未知身份
+	CONST IDENTITY_UNKNOWN = 0;
+	//客户，花店
+	const IDENTITY_CUSTOM = 1;
+	//供货商员工
+	const IDENTITY_STAFF = 2;
+
+	//组合员工基本信息 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]);
+	}
+	
 }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -145,7 +145,7 @@ class PurchaseOrderClass extends BaseClass
     	$supplierInfo = SupplierClass::getByIds($supplierIds,null,'id');
 
     	$adminIds = array_column($list,'adminId');
-	    $adminInfo = AdminClass::getByIds($adminIds,null,'id');
+	    $adminInfo = AdminClass::getAdminByIds($adminIds,null,'id');
 
 	    foreach($list as $k => $val){
 		    $supplierId = $val['supplierId'] ?? 0;