commit

app/api/controller/wechat/AuthController.php

@@ -63,10 +63,10 @@ class AuthController
             ['iv', ''],
             ['encryptedData', ''],
         ]);//获取前台传的code
-        file_put_contents('./5.txt', json_encode($data));
         try {
             //解密获取用户信息
-            $userInfo = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);
+//            $userInfo = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);
+            $userInfo = MiniProgramService::encryptor($session_key, $data['iv1'], $data['encryptedData']);
         } catch (\Exception $e) {
             if ($e->getCode() == '-41003') return app('json')->fail('获取会话密匙失败');
         }
@@ -77,6 +77,7 @@ class AuthController
         $userInfo['code'] = $data['spread_code'];
         $userInfo['session_key'] = $session_key;
         $userInfo['login_type'] = $login_type;
+        $userInfo['phone'] = $userInfo['phoneNumber'];
         $uid = WechatUser::routineOauth($userInfo);
         $userInfo = User::where('uid', $uid)->find();
         if ($userInfo->login_type == 'h5' && ($h5UserInfo = User::where(['account' => $userInfo->phone, 'phone' => $userInfo->phone, 'user_type' => 'h5'])->find()))

app/models/user/User.php

@@ -122,6 +122,7 @@ class User extends BaseModel
         if ($userInfo->spread_uid) {
             return self::edit([
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
+                'phone' => $wechatUser['phone'],
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
             ], $uid, 'uid');
         } else {
@@ -131,6 +132,7 @@ class User extends BaseModel
 //                'spread_uid' => 0,
 //                'spread_time' => 0,
                 'last_time' => time(),
+                'phone' => $wechatUser['phone'],
                 'last_ip' => request()->ip(),
             ];
             //TODO 获取后台分销类型
@@ -211,7 +213,7 @@ class User extends BaseModel
         $res2 = self::create([
             'account' => 'rt' . $routineUser['uid'] . time(),
             'pwd' => md5(123456),
-            'nickname' => $routineUser['nickname'] ?: '',
+            'nickname' => $routineUser['nickname'] ?: '微信用户',
             'avatar' => $routineUser['headimgurl'] ?: '',
 //            'spread_uid' => $spread_uid,
             'is_promoter' => $storeBrokerageStatu != 1 ? 1 : 0,

app/models/user/WechatUser.php

@@ -79,13 +79,14 @@ class WechatUser extends BaseModel
      */
     public static function routineOauth($routine)
     {
-        $routineInfo['nickname'] = filter_emoji($routine['nickName']);//姓名
-        $routineInfo['sex'] = $routine['gender'];//性别
-        $routineInfo['language'] = $routine['language'];//语言
-        $routineInfo['city'] = $routine['city'];//城市
-        $routineInfo['province'] = $routine['province'];//省份
-        $routineInfo['country'] = $routine['country'];//国家
-        $routineInfo['headimgurl'] = $routine['avatarUrl'];//头像
+        $routineInfo['nickname'] = isset($routine['nickName']) ? filter_emoji($routine['nickName']) : '';//姓名
+        $routineInfo['phone'] = isset( $routine['phone']) ?  $routine['phone'] : '';//姓名
+        $routineInfo['sex'] = isset($routine['gender']) ? $routine['gender'] : 0;//性别
+        $routineInfo['language'] = isset($routine['language']) ? $routine['language'] : '';//语言
+        $routineInfo['city'] = isset($routine['city']) ? $routine['city'] : '';//城市
+        $routineInfo['province'] = isset($routine['province']) ? $routine['province'] : '';//省份
+        $routineInfo['country'] = isset($routine['country']) ?  $routine['country'] : '';//国家
+        $routineInfo['headimgurl'] = isset($routine['avatarUrl']) ? $routine['avatarUrl'] : '';//头像
         $routineInfo['routine_openid'] = $routine['openId'];//openid
         $routineInfo['session_key'] = $routine['session_key'];//会话密匙
         $routineInfo['unionid'] = $routine['unionId'];//用户在开放平台的唯一标识符