group/views.py

@@ -2,6 +2,7 @@

                 
              

                 from __future__ import division
              

                 
              

                +import itertools
              

                 import os
              

                 import random
              

                 
              
@@ -585,13 +586,18 @@ def flyimg_upload_api(request):

                         status=True,
              

                         pk__gt=max(current_id, group_user.current_id),
              

                     ).order_by(
              

                +        '-session_id',
              

                         '-pk'
              

                     )
              

                +    # 最新照片
              

                     latest_photo = group_photos.first()
              

                +    # 照片按照 session_id 分组
              

                +    group_photos = map(lambda x: {'session_id': x[0], 'photos': [y.photo_info(user_id) for y in x[1]]},
              

                +                       itertools.groupby(group_photos, lambda x: x.session_id))
              

                 
              

                     return response(200, 'Flyimg Upload Success', u'飞图上传成功', {
              

                         'current_id': latest_photo and latest_photo.pk or current_id,
              

                -        'photos': [photo.photo_info(user_id) for photo in group_photos],
              

                +        'photos': group_photos,
              

                     })