group/migrations/0013_groupinfo_group_default_avatar.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', '0012_groupinfo_group_avatar'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='groupinfo',
              

                +            name='group_default_avatar',
              

                +            field=models.IntegerField(default=0, help_text='\u7fa4\u7ec4\u9ed8\u8ba4\u5934\u50cf\uff0c0 - 255\uff0c\u6c34\u679c\u5934\u50cf', verbose_name='group_default_avatar'),
              

                +        ),
              

                +    ]
              

group/models.py

@@ -19,6 +19,7 @@ class GroupInfo(CreateUpdateMixin):

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

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

                     group_name = models.CharField(_(u'group_name'), max_length=255, blank=True, null=True, help_text=u'群组名称')
              

                +    group_default_avatar = models.IntegerField(_(u'group_default_avatar'), default=0, help_text=u'群组默认头像，0 - 255，水果头像')
              

                     group_avatar = models.CharField(_(u'group_avatar'), max_length=255, blank=True, null=True, help_text=u'群组头像')
              

                     group_desc = models.TextField(_(u'group_desc'), blank=True, null=True, help_text=u'群组描述')
              

                     group_from = models.IntegerField(_(u'group_from'), choices=GROUP_FROM, default=APP_GROUP, help_text=u'群组来源')
              
@@ -37,6 +38,7 @@ class GroupInfo(CreateUpdateMixin):

                         return {
              

                             'group_id': self.group_id,
              

                             'group_name': self.group_name,
              

                +            'group_default_avatar': self.group_default_avatar,
              

                             'group_desc': self.group_desc,
              

                             'group_from': self.group_from,
              

                             'group_lock': self.group_lock,
              

group/views.py

@@ -34,6 +34,7 @@ r = settings.REDIS_CACHE

                 def group_create_api(request):
              

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

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

                +    group_default_avatar = int(request.POST.get('group_default_avatar', 0))
              

                 
              

                     try:
              

                         user = UserInfo.objects.get(user_id=user_id)
              
@@ -45,6 +46,7 @@ def group_create_api(request):

                         group_id=group_id,
              

                         admin_id=user_id,
              

                         group_name=group_name,
              

                +        group_default_avatar=group_default_avatar,
              

                         group_from=GroupInfo.APP_GROUP,
              

                     )
              

                     GroupUserInfo.objects.create(
              
@@ -647,7 +649,7 @@ def pai2_home_api(request):

                     num = int(request.POST.get('num', settings.PAI2_HOME_PER_PAGE))
              

                 
              

                     cursor = connection.cursor()
              

                -    cursor.execute(r"select T1.group_id, T2.group_name, T2.group_avatar, T3.photo_thumbnail_path, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id order by T3.id desc, T3.thumbup_num desc limit {offset}, {rows};".format(
              

                +    cursor.execute(r"select T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.photo_thumbnail_path, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id order by T3.id desc, T3.thumbup_num desc limit {offset}, {rows};".format(
              

                         user_id=user_id,
              

                         offset=0,
              

                         rows=settings.PAI2_HOME_MAX_ROWS,
              
@@ -659,11 +661,12 @@ def pai2_home_api(request):

                     rows = [{
              

                         'group_id': row[0],
              

                         'group_name': row[1],
              

                -        'group_avatar': row[2],
              

                -        'photo_thumbnail_url': u'{0}/{1}'.format(settings.IMG_DOMAIN, row[3]) if row[3] else '',
              

                -        'comment_num': row[4],
              

                -        'thumbup_num': row[5],
              

                -        'created_at': row[6],
              

                +        'group_default_avatar': row[2],
              

                +        'group_avatar': row[3],
              

                +        'photo_thumbnail_url': u'{0}/{1}'.format(settings.IMG_DOMAIN, row[4]) if row[4] else '',
              

                +        'comment_num': row[5],
              

                +        'thumbup_num': row[6],
              

                +        'created_at': row[7],
              

                     } for row in rows]
              

                 
              

                     return JsonResponse({