group/admin.py

@@ -11,7 +11,7 @@ class GroupInfoAdmin(admin.ModelAdmin):

                 
              

                 
              

                 class GroupUserInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('group_id', 'user_id', 'nickname', 'admin', 'user_status', 'passed_at', 'refused_at', 'status', 'created_at', 'updated_at')
              

                +    list_display = ('group_id', 'user_id', 'current_id', 'nickname', 'admin', 'user_status', 'passed_at', 'refused_at', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('user_status', 'status')
              

                 
              

                 
              

group/migrations/0005_groupuserinfo_current_id.py

@@ -0,0 +1,19 @@

                +# -*- coding: utf-8 -*-
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import models, migrations
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('group', '0004_auto_20151216_2337'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='groupuserinfo',
              

                +            name='current_id',
              

                +            field=models.IntegerField(default=-1, help_text='\u5f53\u524d\u7fa4\u7ec4\u7167\u7247ID', verbose_name='current_id'),
              

                +        ),
              

                +    ]
              

group/models.py

@@ -81,6 +81,7 @@ class GroupUserInfo(CreateUpdateMixin):

                 
              

                     group_id = models.CharField(_(u'group_id'), max_length=255, blank=True, null=True, help_text=u'群组唯一标识', db_index=True)
              

                     user_id = models.CharField(_(u'user_id'), max_length=255, blank=True, null=True, help_text=u'用户唯一标识')
              

                +    current_id = models.IntegerField(_(u'current_id'), default=-1, help_text=u'当前群组照片ID')
              

                     nickname = models.CharField(_(u'nickname'), max_length=255, blank=True, null=True, help_text=u'用户群组昵称')
              

                     admin = models.BooleanField(_(u'admin'), default=False, help_text=u'群组管理员')
              

                     user_status = models.IntegerField(_(u'user_status'), choices=USER_STATUS, default=APPLYING)
              

group/serializers.py

@@ -14,7 +14,7 @@ class GroupInfoSerializer(serializers.HyperlinkedModelSerializer):

                 class GroupUserInfoSerializer(serializers.HyperlinkedModelSerializer):
              

                     class Meta:
              

                         model = GroupUserInfo
              

                -        fields = ('group_id', 'user_id', 'nickname', 'admin', 'user_status', 'passed_at', 'refused_at', 'status', 'created_at', 'updated_at')
              

                +        fields = ('group_id', 'user_id', 'current_id', 'nickname', 'admin', 'user_status', 'passed_at', 'refused_at', 'status', 'created_at', 'updated_at')
              

                 
              

                 
              

                 class GroupPhotoInfoSerializer(serializers.HyperlinkedModelSerializer):
              

group/views.py

@@ -163,9 +163,12 @@ def group_join_api(request):

                             'message': u'重复加群申请',
              

                         })
              

                 
              

                +    group_photo = GroupPhotoInfo.objects.filter(group_id=group_id).last()
              

                +
              

                     GroupUserInfo.objects.create(
              

                         group_id=group_id,
              

                         user_id=user_id,
              

                +        current_id=group_photo and group_photo.id or -1,
              

                         nickname=nickname or user.username,
              

                         admin=False,
              

                         user_status=GroupUserInfo.PASSED,
              
@@ -398,6 +401,14 @@ def flyimg_upload_api(request):

                             'message': u'群组不存在',
              

                         })
              

                 
              

                +    try:
              

                +        group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
              

                +    except GroupUserInfo.DoesNotExist:
              

                +        return JsonResponse({
              

                +            'status': 4029,
              

                +            'message': u'该用户不在群组',
              

                +        })
              

                +
              

                     if photo:
              

                         _, extension = os.path.splitext(photo.name)
              

                 
              
@@ -423,7 +434,7 @@ def flyimg_upload_api(request):

                 
              

                     group_photos = GroupPhotoInfo.objects.filter(
              

                         group_id=group_id,
              

                -        pk__gt=current_id,
              

                +        pk__gt=max(current_id, group_user.current_id),
              

                     )
              

                     latest_photo = group_photos.last()
              

                 
              

pai2/settings.py

@@ -104,7 +104,7 @@ DATABASES = {

                 # Internationalization
              

                 # https://docs.djangoproject.com/en/1.8/topics/i18n/
              

                 
              

                -LANGUAGE_CODE = 'zh_CN'
              

                +LANGUAGE_CODE = 'zh-Hans'
              

                 
              

                 TIME_ZONE = 'Asia/Shanghai'