|
|
@@ -231,38 +231,10 @@ class AdminClass extends BaseClass
|
|
|
public static function replaceAdmin($wxInfo, $source)
|
|
|
{
|
|
|
$wxInfo = self::switchAdminInfo($wxInfo, $source);
|
|
|
- $adminSource = UserClass::$userSourceId;
|
|
|
$unionId = isset($wxInfo['unionId']) && !empty($wxInfo['unionId']) ? $wxInfo['unionId'] : '';
|
|
|
- $unionAdmin = [];
|
|
|
- if (!empty($unionId)) {
|
|
|
- //$unionAdmin = self::getByUnionId($unionId);
|
|
|
- }
|
|
|
- switch ($source) {
|
|
|
- case $adminSource['mini']['name']:
|
|
|
- $sourceId = $adminSource['mini']['id'];
|
|
|
- $miniOpenId = $wxInfo['miniOpenId'];
|
|
|
- $admin = self::getByMiniOpenId($miniOpenId);
|
|
|
- break;
|
|
|
- case $adminSource['official']['name']:
|
|
|
- $sourceId = $adminSource['official']['id'];
|
|
|
- $openId = isset($wxInfo['openId']) ? $wxInfo['openId'] : '';
|
|
|
- $admin = [];
|
|
|
- if (!empty($openId)) {
|
|
|
- $admin = self::getByOpenId($openId);
|
|
|
- }
|
|
|
- break;
|
|
|
- default:
|
|
|
- throw new \Exception('未知来源的用户');
|
|
|
- }
|
|
|
+ $admin = \biz\admin\classes\AdminClass::getByCondition(['unionId' => $unionId]);
|
|
|
if (empty($admin)) {
|
|
|
- if (!empty($unionAdmin)) {
|
|
|
- //1、在小程序端已经授权用户信息和unionId之后,关注公众号时走这里
|
|
|
- //2、关注了公众号或者H5已经授权时,并首次访问小程序
|
|
|
- $admin = self::updateAdmin($unionAdmin, $wxInfo);
|
|
|
- } else {
|
|
|
- $wxInfo['sourceType'] = $sourceId;
|
|
|
- $admin = self::generateAdmin($wxInfo);
|
|
|
- }
|
|
|
+ $admin = self::generateAdmin($wxInfo);
|
|
|
} else {
|
|
|
$admin = self::updateAdmin($admin, $wxInfo);
|
|
|
}
|