|
|
@@ -4,6 +4,7 @@ namespace biz\admin\classes;
|
|
|
|
|
|
use biz\user\classes\UserClass;
|
|
|
use common\components\util;
|
|
|
+use common\services\ImageService;
|
|
|
use Yii;
|
|
|
use biz\base\classes\BaseClass;
|
|
|
|
|
|
@@ -233,6 +234,8 @@ class AdminClass extends BaseClass
|
|
|
if (empty($user)) {
|
|
|
$adminInfo['source'] = $sourceId;
|
|
|
$user = self::generateAdmin($adminInfo);
|
|
|
+ } else {
|
|
|
+ $user = self::updateAdminInfo($user, $userInfo);
|
|
|
}
|
|
|
//存在相同unionid则进行合并
|
|
|
$unionId = isset($adminInfo['unionId']) ? $adminInfo['unionId'] : '';
|
|
|
@@ -247,6 +250,56 @@ class AdminClass extends BaseClass
|
|
|
return $user;
|
|
|
}
|
|
|
|
|
|
+ public static function updateAdminInfo($originalUser, $getUserInfo)
|
|
|
+ {
|
|
|
+ $data = [];
|
|
|
+ $adminId = $originalUser['id'];
|
|
|
+ //替换掉微信不支持的图片
|
|
|
+ $userName = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
|
|
|
+ if (!empty($userName)) {
|
|
|
+ $data['userName'] = $userName;
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['openId']) && !empty($getUserInfo['openId'])) {
|
|
|
+ $openId = $getUserInfo['openId'];
|
|
|
+ $data['openId'] = $openId;
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['miniOpenId']) && !empty($getUserInfo['miniOpenId'])) {
|
|
|
+ $data['miniOpenId'] = $getUserInfo['miniOpenId'];
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['unionId']) && !empty($getUserInfo['unionId'])) {
|
|
|
+ $data['unionId'] = $getUserInfo['unionId'];
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['sex'])) {
|
|
|
+ $data['sex'] = $getUserInfo['sex'];
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['subscribe'])) {
|
|
|
+ $data['subscribe'] = $getUserInfo['subscribe'];
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['subscribeTime'])) {
|
|
|
+ $data['subscribeTime'] = $getUserInfo['subscribeTime'];
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['isFull'])) {
|
|
|
+ $data['isFull'] = $getUserInfo['isFull'];
|
|
|
+ }
|
|
|
+ if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
|
|
|
+ $data['isFull'] = 1;
|
|
|
+ }
|
|
|
+ //更新头像
|
|
|
+ $merchantId = 0;
|
|
|
+ if (isset($originalUser['avatar']) == false || empty($originalUser['avatar'])) {
|
|
|
+ if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
|
|
|
+ $imgUrl = $getUserInfo['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)
|
|
|
{
|
|
|
$date = date("Y-m-d H:i:s");
|