photo/views.py

@@ -151,6 +151,7 @@ def session_join_api(request):

                     """
              

                     user_id = request.POST.get('user_id', '')
              

                     session_id = request.POST.get('session_id', '')
              

                +    nickname = request.POST.get('nickname', '')
              

                     current_id = -1
              

                 
              

                     # 判断 user_id 是否存在，如果不存在，则直接分配帐户
              
@@ -180,7 +181,7 @@ def session_join_api(request):

                     group_user, group_user_created = GroupUserInfo.objects.get_or_create(group_id=group_id, user_id=user_id, defaults={
              

                         # 'current_id': int(r.get(GROUP_LAST_PHOTO_PK % group_id) or -1),
              

                         'current_id': current_id,  # 通过扫描 session_id 二维码进群的用户，默认可以查看该群组所有照片
              

                -        'nickname': user.final_nickname,
              

                +        'nickname': nickname or user.final_nickname,
              

                         'avatar': user.avatar,
              

                         'admin': group_created,
              

                         'user_status': GroupUserInfo.PASSED,
              
@@ -188,7 +189,7 @@ def session_join_api(request):

                     })
              

                 
              

                     # Redis 群组用户数据缓存
              

                -    group_users = set_group_users_info(group) if group_user_created else get_group_info(group_id)
              

                +    group_users = set_group_users_info(group) if group_user_created else get_group_users_info(group_id, user_id)
              

                 
              

                     # 获取 Session 照片
              

                     photos = PhotosInfo.objects.filter(session_id=session_id)