|
|
@@ -107,7 +107,6 @@ class UserClass extends BaseClass
|
|
|
$getUserInfo['identity'] = 0;
|
|
|
$subscribe = isset($getUserInfo['subscribe']) ? $getUserInfo['subscribe'] : 0;
|
|
|
$getUserInfo['subscribe'] = $subscribe;
|
|
|
- $getUserInfo['sjId'] = $sjId;
|
|
|
$getUserInfo['status'] = 0;
|
|
|
//默认没有完整用户信息
|
|
|
$isFull = isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl']) ? 1 : 0;
|
|
|
@@ -125,7 +124,7 @@ class UserClass extends BaseClass
|
|
|
$user = self::add($getUserInfo);
|
|
|
$userId = $user['id'];
|
|
|
|
|
|
- $assetData = ['userId' => $userId, 'sjId' => $sjId, 'createTime' => $date];
|
|
|
+ $assetData = ['userId' => $userId, 'createTime' => $date];
|
|
|
//生成用户资产信息
|
|
|
UserAssetClass::add($assetData);
|
|
|
|
|
|
@@ -133,21 +132,18 @@ class UserClass extends BaseClass
|
|
|
if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
|
|
|
if (empty($preUser) || (isset($preUser['avatar']) && empty($preUser['avatar']))) {
|
|
|
$imgUrl = $getUserInfo['headImgUrl'];
|
|
|
- $currentImg = ImageService::generateAvatar($sjId, $imgUrl);
|
|
|
+ $currentImg = ImageService::generateAvatar(0, $imgUrl);
|
|
|
if (!empty($currentImg)) {
|
|
|
self::updateById($userId, ['avatar' => $currentImg]);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- //客户数粉丝数增加
|
|
|
- MerchantAssetClass::addUser($sjId, $subscribe, true);
|
|
|
return $user;
|
|
|
}
|
|
|
|
|
|
public static function updateUser($originalUser, $getUserInfo, $sjId)
|
|
|
{
|
|
|
$data = [];
|
|
|
- $assetData = [];
|
|
|
$userId = $originalUser['id'];
|
|
|
//替换掉微信不支持的图片
|
|
|
$userName = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
|
|
|
@@ -173,7 +169,6 @@ class UserClass extends BaseClass
|
|
|
if (isset($getUserInfo['subscribeTime'])) {
|
|
|
$data['subscribeTime'] = $getUserInfo['subscribeTime'];
|
|
|
}
|
|
|
- $data['sjId'] = $sjId;
|
|
|
if (isset($getUserInfo['alipayId']) && !empty($getUserInfo['alipayId'])) {
|
|
|
$data['alipayId'] = $getUserInfo['alipayId'];
|
|
|
}
|
|
|
@@ -187,20 +182,13 @@ class UserClass extends BaseClass
|
|
|
if (isset($originalUser['avatar']) == false || empty($originalUser['avatar'])) {
|
|
|
if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
|
|
|
$imgUrl = $getUserInfo['headImgUrl'];
|
|
|
- $name = ImageService::generateAvatar($sjId, $imgUrl);
|
|
|
+ $name = ImageService::generateAvatar(0, $imgUrl);
|
|
|
if (!empty($name)) {
|
|
|
$data['avatar'] = $name;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- //增加粉丝数
|
|
|
- if (isset($originalUser['subscribe']) && $originalUser['subscribe'] == 0 && isset($getUserInfo['subscribe']) && $getUserInfo['subscribe'] == 1) {
|
|
|
- MerchantAssetClass::addUser($sjId, 1, false);
|
|
|
- }
|
|
|
self::updateById($userId, $data);
|
|
|
- if (!empty($assetData)) {
|
|
|
- UserAssetClass::updateByUserId($userId, $assetData);
|
|
|
- }
|
|
|
$user = self::getById($userId);
|
|
|
return $user;
|
|
|
}
|
|
|
@@ -248,7 +236,7 @@ class UserClass extends BaseClass
|
|
|
]);
|
|
|
$targetId = $return['id'];
|
|
|
|
|
|
- $capitalType = dict::getDict('capitalType','xhMergeUser','id');
|
|
|
+ $capitalType = dict::getDict('capitalType', 'xhMergeUser', 'id');
|
|
|
$now = time();
|
|
|
$date = date("Y-m-d H:i:s");
|
|
|
|
|
|
@@ -485,67 +473,11 @@ class UserClass extends BaseClass
|
|
|
{
|
|
|
$userInfo = self::switchUserInfo($userInfo, $source);
|
|
|
$unionId = isset($userInfo['unionId']) && !empty($userInfo['unionId']) ? $userInfo['unionId'] : '';
|
|
|
- $unionUser = [];
|
|
|
- if (!empty($unionId)) {
|
|
|
- $unionUser = self::getByUnionId($unionId);
|
|
|
- }
|
|
|
- $userSource = self::$userSourceId;
|
|
|
- switch ($source) {
|
|
|
- case $userSource['mini']['name']:
|
|
|
- $sourceId = $userSource['mini']['id'];
|
|
|
- $miniOpenId = $userInfo['miniOpenId'];
|
|
|
- $user = self::getByMiniOpenId($miniOpenId);
|
|
|
- break;
|
|
|
- case $userSource['alipay']['name']:
|
|
|
- $sourceId = $userSource['alipay']['id'];
|
|
|
- $alipayId = $userInfo['alipayId'];
|
|
|
- $user = self::getByAlipayId($alipayId, $sjId);
|
|
|
- break;
|
|
|
- case $userSource['official']['name']:
|
|
|
- $sourceId = $userSource['official']['id'];
|
|
|
- //后台添加的客户没有openId
|
|
|
- $openId = isset($userInfo['openId']) ? $userInfo['openId'] : '';
|
|
|
- $user = [];
|
|
|
- if (!empty($openId)) {
|
|
|
- $user = self::getByOpenId($openId, $sjId);
|
|
|
- }
|
|
|
- break;
|
|
|
- case $userSource['system']['name']:
|
|
|
- $sourceId = $userSource['system']['id'];
|
|
|
- $mobile = isset($userInfo['mobile']) && !empty($userInfo['mobile']) ? $userInfo['mobile'] : '';
|
|
|
- $user = [];
|
|
|
- if (!empty($mobile)) {
|
|
|
- $user = self::getByCondition(['sjId' => $sjId, 'mobile' => $mobile]);
|
|
|
- }
|
|
|
- break;
|
|
|
- default:
|
|
|
- throw new \Exception('未知来源的用户');
|
|
|
- }
|
|
|
-
|
|
|
- //支付宝暂时获取不到很多客户信息不进行更新
|
|
|
- if ($source == $userSource['alipay']['name']) {
|
|
|
- if (!empty($user)) {
|
|
|
- return $user;
|
|
|
- }
|
|
|
- }
|
|
|
+ $user = UserClass::getByUnionId($unionId);
|
|
|
if (empty($user)) {
|
|
|
- if (!empty($unionUser)) {
|
|
|
- //1、在小程序端已经授权用户信息和unionId之后,关注公众号时走这里
|
|
|
- //2、关注了公众号或者H5已经授权时,并首次访问小程序
|
|
|
- $user = self::updateUser($unionUser, $userInfo, $sjId);
|
|
|
- } else {
|
|
|
- $userInfo['sourceType'] = $sourceId;
|
|
|
- $userInfo['sjId'] = $sjId;
|
|
|
- $user = self::generateUser($userInfo, $sjId);
|
|
|
- }
|
|
|
+ $user = self::generateUser($userInfo, 0);
|
|
|
} else {
|
|
|
- if (!empty($unionUser)) {
|
|
|
- if (isset($unionUser['id']) && isset($user['id']) && $user['id'] != $unionUser['id']) {
|
|
|
- //合并相同客户
|
|
|
- $user = self::mergeUser($unionUser, $user);
|
|
|
- }
|
|
|
- }
|
|
|
- $user = self::updateUser($user, $userInfo, $sjId);
|
|
|
+ $user = self::updateUser($user, $userInfo, 0);
|
|
|
}
|
|
|
return $user;
|
|
|
}
|