客户详情

app/ghs/controllers/CustomController.php

@@ -43,9 +43,8 @@ class CustomController extends BaseController
     public function actionDetail()
     {
         $get = Yii::$app->request->get();
-        $shopId = isset($get['shopId']) ? $get['shopId'] : -1;
-        $ghsId = $this->ghsId;
-        $info = CustomService::getFullInfo($ghsId, $shopId);
+        $customId = $get['id'] ?? 0;
+        $info = CustomService::getCustomInfo($customId);
         CustomClass::valid($info, $this->ghsId);
         util::success($info);
     }
@@ -66,7 +65,7 @@ class CustomController extends BaseController
     public function actionAdd()
     {
         $post = Yii::$app->request->post();
-        ApplyService::addCustom($post,$this->ghsId);
+        ApplyService::addCustom($post, $this->ghsId);
         util::complete('已提交审核');
     }
 

biz-ghs/custom/services/CustomService.php

@@ -3,42 +3,49 @@
 namespace bizGhs\custom\services;
 
 use biz\base\services\BaseService;
-use biz\merchant\classes\ShopClass;
-use bizGhs\shop\classes\ShopAdminClass;
+use bizGhs\merchant\classes\ShopClass;
 use bizGhs\custom\classes\CustomClass;
 use Yii;
 
 class CustomService extends BaseService
 {
-	
-	public static $baseFile = '\bizGhs\custom\classes\CustomClass';
-	
-	public static function getCustomList($where)
-	{
-		$data = CustomClass::getList('*', $where, 'addTime DESC');
-		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
-		if (empty($list)) {
-			return $data;
-		}
-		$data['list'] = CustomClass::groupBaseInfo($list);
-		$data['isOpenNum'] = 10;
-		$data['allNum'] = 80;
-		return $data;
-	}
 
-	//获取客户信息 shish 2021.1.8
-	public static function getFullInfo($ghsId, $shopId)
-	{
-		$custom = CustomClass::getByCondition(['ghsId' => $ghsId, 'shopId' => $shopId]);
-		if (empty($custom)) {
-			return [];
-		}
-		$list = CustomClass::groupBaseInfo([$custom]);
-		$custom = current($list);
-		$custom['no'] = 1254358;
-		$shopInfo = ShopClass::getAddressAndManager($shopId);
-		$custom['shopInfo'] = $shopInfo;
-		return $custom;
-	}
-	
+    public static $baseFile = '\bizGhs\custom\classes\CustomClass';
+
+    public static function getCustomList($where)
+    {
+        $data = CustomClass::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+        $data['list'] = CustomClass::groupBaseInfo($list);
+        $data['isOpenNum'] = 10;
+        $data['allNum'] = 80;
+        return $data;
+    }
+
+    //获取客户信息，包括商家头像和店长信息 shish 2021.1.8
+    public static function getCustomInfo($customId)
+    {
+        $custom = CustomClass::getById($customId);
+        if (empty($custom)) {
+            return [];
+        }
+        $list = CustomClass::groupBaseInfo([$custom]);
+        $custom = current($list);
+        $retailShopId = $custom['retailShopId'] ?? 0;
+        $retailShop = \biz\merchant\classes\ShopClass::getById($retailShopId);
+        $super = \biz\merchant\classes\ShopClass::getSuper($retailShopId);
+        $custom['province'] = $retailShop['province'] ?? '';
+        $custom['city'] = $retailShop['city'] ?? '';
+        $custom['address'] = $retailShop['address'] ?? '';
+        $custom['floor'] = $retailShop['floor'] ?? '';
+        $custom['lat'] = $retailShop['lat'] ?? '';
+        $custom['long'] = $retailShop['long'] ?? '';
+        $custom['userName'] = $super['adminName'] ?? '';
+        $custom['mobile'] = $super['mobile'] ?? '';
+        return $custom;
+    }
+
 }

biz/admin/classes/AdminClass.php

@@ -10,353 +10,353 @@ 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'],
-	];
-	
-	//组合员工基本信息 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]);
-	}
-	
+
+    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)) {
+            return [];
+        }
+        $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]);
+    }
+
 }

biz/merchant/classes/ShopClass.php

@@ -94,15 +94,15 @@ class ShopClass extends BaseClass
         return $gatheringCode;
     }
 
-    //取门店店长信息和地址信息
-    public static function getAddressAndManager($shopId)
+    //取门店长信息 shish 2021.1.17
+    public static function getSuper($id)
     {
-        $shop = ShopClass::getById($shopId);
-        $manager = ShopAdminClass::getManager($shopId);
-        $name = isset($manager['adminName']) ? $manager['adminName'] : '';
-        $mobile = isset($manager['mobile']) ? $manager['mobile'] : '';
-        $address = isset($shop['fullAddress']) ? $shop['fullAddress'] : '';
-        return ['userName' => $name, 'mobile' => $mobile, 'address' => $address];
+        $shop = self::getById($id);
+        if (empty($shop)) {
+            return [];
+        }
+        $adminId = $shop['adminId'] ?? 0;
+        return \biz\admin\classes\AdminClass::getDetail($adminId);
     }
 
 }

sql.sql

@@ -524,3 +524,13 @@ ALTER TABLE xhAdmin ADD currentShopId INT NOT NULL DEFAULT 0 COMMENT '当前管
 ALTER TABLE `xhGhsPurchaseOrder`
 CHANGE COLUMN `totalGoodsPrice` `totalItemPrice`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '商品总价格' AFTER `itemNumPiece`;
 
+
+====
+==shish 2021-01-17
+ALTER TABLE xhGhsShop AUTO_INCREMENT=35816;
+ALTER TABLE xhGhsCustom CHANGE `shopId` `retailShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '零售门店id';
+ALTER TABLE xhItem MODIFY unitNum TINYINT(4) NOT NULL DEFAULT '0' COMMENT '每扎多少支，每包多少支，每箱多少块，每扎多少条';
+ALTER TABLE `xhGhsShopAdmin` ADD `super` TINYINT NOT NULL DEFAULT 0 COMMENT '是否店长或超级管理员0不是1是' AFTER `roleId`;
+ALTER TABLE `xhShopAdmin` ADD `super` TINYINT NOT NULL DEFAULT 0 COMMENT '是否店长或超级管理员0不是1是' AFTER `roleId`;
+ALTER TABLE `xhGhsShop` ADD adminId INT NOT NULL DEFAULT 0 COMMENT '店长id' AFTER `ghsId`;
+ALTER TABLE `xhShop` ADD adminId INT NOT NULL DEFAULT 0 COMMENT '店长id' AFTER `merchantId`;