获取用户信息

app-mall/controllers/UserController.php

@@ -47,7 +47,8 @@ class UserController extends BaseController
         $post = Yii::$app->request->post();
         $iv = isset($post['iv']) ? $post['iv'] : '';
         $encryptedData = isset($post['encryptedData']) ? $post['encryptedData'] : '';
-        $appId = $this->sj['miniAppId'];
+        $sjWx = $this->sjWx;
+        $appId = $sjWx['miniAppId'];
         $sjId = $this->sjId;
         $miniOpenId = $this->user['miniOpenId'];
         if (empty($miniOpenId)) {
@@ -65,11 +66,11 @@ class UserController extends BaseController
         }
         Yii::info('小程序获取用户信息：' . $result);
         $originalInfo = Json::decode($result);
+        //新接口没有openId这边补一下，以免后面的流程报错
+        $originalInfo['miniOpenId'] = $miniOpenId;
         $source = UserClass::$userSourceId['mini']['name'];
-        $user = UserClass::replaceUser($originalInfo, $source, $sjId);
-        $userId = $user['id'];
-        $userInfo = UserService::getUserInfo($userId);
-        util::success($userInfo);
+        $user = UserClass::replaceUser($originalInfo, $source, $sjId, $this->shopId);
+        util::success($user);
     }
 
     //小程序用户手机号

biz-hd/custom/classes/CustomClass.php

@@ -20,7 +20,6 @@ class CustomClass extends BaseClass
         return 'hd_custom_key_' . $sjId . '_' . $userId;
     }
 
-
     //创建或获取客户信息 ssh 2021.3.19
     public static function replaceCustom($sjId, $user, $shopId)
     {

biz-mall/user/classes/UserClass.php

@@ -171,13 +171,11 @@ class UserClass extends BaseClass
     public static function updateUser($originalUser, $getUserInfo)
     {
         $data = [];
-        $assetData = [];
         $userId = $originalUser['id'];
         //替换掉微信不支持的图片
         $userName = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
         if (!empty($userName)) {
-            $data['userName'] = $userName;
-            $data['nickName'] = $userName;
+            $data['name'] = $userName;
         }
         if (isset($getUserInfo['openId']) && !empty($getUserInfo['openId'])) {
             $openId = $getUserInfo['openId'];
@@ -207,24 +205,7 @@ class UserClass extends BaseClass
         if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
             $data['isFull'] = 1;
         }
-        //更新头像
-        if (isset($originalUser['avatar']) == false || empty($originalUser['avatar'])) {
-            if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
-                $imgUrl = $getUserInfo['headImgUrl'];
-                $name = ImageService::generateAvatar($imgUrl);
-                if (!empty($name)) {
-                    $data['avatar'] = $name;
-                }
-            }
-        }
-        //增加粉丝数
-        if (isset($originalUser['subscribe']) && $originalUser['subscribe'] == 0 && isset($getUserInfo['subscribe']) && $getUserInfo['subscribe'] == 1) {
-            MerchantAssetClass::addUser(1, false);
-        }
         self::updateById($userId, $data);
-        if (!empty($assetData)) {
-            UserAssetClass::updateByUserId($userId, $assetData);
-        }
         $user = self::getById($userId);
         return $user;
     }
@@ -234,9 +215,9 @@ class UserClass extends BaseClass
         return self::getByCondition(['miniOpenId' => $miniOpenId]);
     }
 
-    public static function getByAlipayId($alipayId)
+    public static function getByAlipayId($aliId)
     {
-        return self::getByCondition(['alipayId' => $alipayId]);
+        return self::getByCondition(['alipayId' => $aliId]);
     }
 
     public static function getByOpenId($openId)
@@ -505,14 +486,9 @@ class UserClass extends BaseClass
     }
 
     //创建以及更新用户 ssh 2020.2.7
-    public static function replaceUser($userInfo, $source, $sjId)
+    public static function replaceUser($userInfo, $source, $sjId, $shopId = 0)
     {
         $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']:
@@ -522,8 +498,8 @@ class UserClass extends BaseClass
                 break;
             case $userSource['alipay']['name']:
                 $sourceId = $userSource['alipay']['id'];
-                $alipayId = $userInfo['alipayId'];
-                $user = self::getByAlipayId($alipayId);
+                $aliId = $userInfo['alipayId'];
+                $user = self::getByAlipayId($aliId);
                 break;
             case $userSource['official']['name']:
                 $sourceId = $userSource['official']['id'];
@@ -552,23 +528,17 @@ class UserClass extends BaseClass
             }
         }
         if (empty($user)) {
-            if (!empty($unionUser)) {
-                //1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
-                //2、关注了公众号或者H5已经授权时，并首次访问小程序
-                $user = self::updateUser($unionUser, $userInfo);
-            } else {
-                $userInfo['sourceType'] = $sourceId;
-                $user = self::generateUser($userInfo);
-            }
+            $userInfo['sourceType'] = $sourceId;
+            $user = self::generateUser($userInfo);
+        } else {
+            $user = self::updateUser($user, $userInfo);
         }
-
         $custom = [];
         if (!empty($sjId)) {
             //创建客户信息
-            $custom = CustomClass::replaceCustom($sjId, $user);
+            $custom = CustomClass::replaceCustom($sjId, $user, $shopId);
         }
         $user['customInfo'] = $custom;
-
         return $user;
     }