api/admin_views.py

@@ -804,7 +804,6 @@ def member_activity_list(request):

                     count = logs.count()
              

                     logs, left = pagination(logs, page, num)
              

                     logs = [log.admindata for log in logs]
              

                -    print logs
              

                     return response(200, 'Get Member Activity Record Success', u'获取会员活动成功', data={
              

                         'logs': logs,
              

                         'left': left,
              
@@ -937,4 +936,36 @@ def member_activity_create(request):

                         activity_state=activity_state
              

                     )
              

                 
              

                -    return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功')
              

                +    return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功')
              

                +
              

                +def member_activity_share_list(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

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

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

                +    page = int(request.POST.get('page', 1))
              

                +    num = int(request.POST.get('num', 20))
              

                +
              

                +    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
              

                +        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
              

                +
              

                +    try:
              

                +        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              

                +    except AdministratorInfo.DoesNotExist:
              

                +        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                +
              

                +    logs = MemberActivityGroupShareInfo.objects.filter(activity_id=activity_id, status=True)
              

                +
              

                +    total_integral = logs.aggregate(Sum('integral'))['integral__sum']
              

                +
              

                +    logs = logs.values('share_user_id').annotate(integral_sum=Sum('integral'), group_count=Count('open_gid'), user_count=Count('click_user_id')).order_by('-user_count')
              

                +    
              

                +    count = logs.count()
              

                +    logs, left = pagination(logs, page, num)
              

                +
              

                +    return response(200, 'Get Member Activity Record Success', u'获取会员活动成功', data={
              

                +        'logs': list(logs),
              

                +        'count': count,
              

                +        'left': left,
              

                +        'total_integral': total_integral
              

                +    })
              

                +
              

api/urls.py

@@ -331,6 +331,8 @@ urlpatterns += [

                     url(r'^admin/member/activity/details$', admin_views.member_activity_details, name='member_activity_details'),
              

                     url(r'^admin/member/activity/update$', admin_views.member_activity_update, name='member_activity_update'),
              

                     url(r'^admin/member/activity/create$', admin_views.member_activity_create, name='member_activity_create'),
              

                +    url(r'^admin/member/activity/share/list$', admin_views.member_activity_share_list, name='member_activity_share_list'),
              

                +    
              

                 ]
              

                 
              

                 urlpatterns += [
              

member/migrations/0024_auto_20201204_1831.py

@@ -0,0 +1,24 @@

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

                +# Generated by Django 1.11.26 on 2020-12-04 10:31
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('member', '0023_memberactivityinfo_activity_state'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AlterField(
              

                +            model_name='memberactivityinfo',
              

                +            name='activity_state',
              

                +            field=models.IntegerField(choices=[(0, '\u8349\u7a3f'), (1, '\u5df2\u53d1\u5e03'), (2, '\u4e0b\u7ebf')], db_index=True, default=0, help_text='\u6d3b\u52a8\u72b6\u6001', verbose_name='activity_state'),
              

                +        ),
              

                +        migrations.AlterUniqueTogether(
              

                +            name='memberactivitygroupshareinfo',
              

                +            unique_together=set([('activity_id', 'share_user_id', 'click_user_id', 'open_gid', 'brand_id')]),
              

                +        ),
              

                +    ]
              

member/models.py

@@ -540,6 +540,10 @@ class MemberActivityGroupShareInfo(BaseModelMixin):

                     class Meta:
              

                         verbose_name = _(u'会员活动群组分享信息')
              

                         verbose_name_plural = _(u'会员活动群组分享信息')
              

                +        
              

                +        unique_together = (
              

                +            ('activity_id', 'share_user_id', 'click_user_id', 'open_gid', 'brand_id'),
              

                +        )
              

                 
              

                     def __unicode__(self):
              

                         return '%d' % self.pk