+from member.models import MemberActivityDataInfo, MemberActivitySignupInfo
from utils.error.errno_utils import UserStatusCode
@@ -37,13 +37,14 @@ def activity_data_list(request, administrator):
count = logs.count()
logs, left = pagination(logs, page, num)
logs = [log.admindata for log in logs]
-
+
return response(200, 'Get Member Activity Data List Success', u'获取会员活动数据列表成功', data={
'logs': logs,
'count': count,
'left': left,
})
+
@check_admin
def activity_integral_add(request, administrator):
activity_id = request.POST.get('activity_id', '')
@@ -1,14 +1,16 @@ |
||
1 | 1 |
# -*- coding: utf-8 -*- |
2 | 2 |
|
3 | 3 |
from django.conf import settings |
4 |
-from django_logit import logit |
|
5 | 4 |
from django.db.models import Q |
5 |
+from django_logit import logit |
|
6 | 6 |
from django_response import response |
7 | 7 |
|
8 | 8 |
from account.models import LensmanInfo |
9 |
-from member.models import MemberActivityInfo, MemberActivityDataInfo, MemberActivitySignupInfo, MemberActivityContributionInfo |
|
9 |
+from member.models import (MemberActivityContributionInfo, MemberActivityDataInfo, MemberActivityInfo, |
|
10 |
+ MemberActivitySignupInfo) |
|
10 | 11 |
from utils.error.errno_utils import MemberActivityStatusCode |
11 | 12 |
|
13 |
+ |
|
12 | 14 |
@logit |
13 | 15 |
def activity_data_submit(request): |
14 | 16 |
user_id = request.POST.get('user_id', '') |
@@ -20,7 +22,7 @@ def activity_data_submit(request): |
||
20 | 22 |
act = MemberActivityInfo.objects.get(activity_id=activity_id, status=True) |
21 | 23 |
except MemberActivityInfo.DoesNotExist: |
22 | 24 |
return response(MemberActivityStatusCode.ACTIVITY_NOT_FOUND) |
23 |
- |
|
25 |
+ |
|
24 | 26 |
try: |
25 | 27 |
lensman = LensmanInfo.objects.get(lensman_id=lensman_id, status=True) |
26 | 28 |
except LensmanInfo.DoesNotExist: |
@@ -82,10 +84,8 @@ def activity_message_read(request): |
||
82 | 84 |
|
83 | 85 |
if signup_id: |
84 | 86 |
MemberActivitySignupInfo.objects.filter(user_id=user_id, signup_id=signup_id).update(is_read=True) |
85 |
- |
|
87 |
+ |
|
86 | 88 |
if contribution_id: |
87 | 89 |
MemberActivityContributionInfo.objects.filter(user_id=user_id, contribution_id=contribution_id).update(is_read=True) |
88 | 90 |
|
89 | 91 |
return response(200, 'Activity Message Has Read Success', '活动消息已读') |
90 |
- |
|
91 |
- |
@@ -507,7 +507,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin): |
||
507 | 507 |
def is_contributed(self, user_id): |
508 | 508 |
# 是否投稿 |
509 | 509 |
return MemberActivityContributionInfo.objects.filter(user_id=user_id, activity_id=self.activity_id, status=True).exists() |
510 |
- |
|
510 |
+ |
|
511 | 511 |
def is_signup_passed(self, user_id): |
512 | 512 |
return MemberActivitySignupInfo.objects.filter(user_id=user_id, activity_id=self.activity_id, audit_status=MemberActivitySignupInfo.PASSED, status=True).exists() |
513 | 513 |
|
@@ -780,7 +780,6 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin): |
||
780 | 780 |
@property |
781 | 781 |
def final_avatar(self): |
782 | 782 |
return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER) |
783 |
- |
|
784 | 783 |
|
785 | 784 |
@property |
786 | 785 |
def data(self): |
@@ -810,7 +809,8 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin): |
||
810 | 809 |
'is_signin': self.is_signin, |
811 | 810 |
'audit_status': self.audit_status, |
812 | 811 |
} |
813 |
- |
|
812 |
+ |
|
813 |
+ |
|
814 | 814 |
class MemberActivityDataInfo(BaseModelMixin, BrandInfoMixin): |
815 | 815 |
data_id = ShortUUIDField(_(u'data_id'), max_length=32, blank=True, null=True, help_text=u'活动数据唯一标识', db_index=True, unique=True) |
816 | 816 |
|
@@ -953,7 +953,6 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin): |
||
953 | 953 |
|
954 | 954 |
is_read = models.BooleanField(_(u'is_read'), default=False, help_text=u'审核消息是否已读') |
955 | 955 |
|
956 |
- |
|
957 | 956 |
class Meta: |
958 | 957 |
verbose_name = _(u'会员活动投稿信息') |
959 | 958 |
verbose_name_plural = _(u'会员活动投稿信息') |
@@ -1101,7 +1100,6 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi |
||
1101 | 1100 |
|
1102 | 1101 |
send_template_message_res = JSONField(_(u'send_template_message_res'), blank=True, null=True, help_text=u'send_template_message_res') |
1103 | 1102 |
|
1104 |
- |
|
1105 | 1103 |
class Meta: |
1106 | 1104 |
verbose_name = _(u'会员活动投稿福利解锁信息') |
1107 | 1105 |
verbose_name_plural = _(u'会员活动投稿福利解锁信息') |
@@ -4,6 +4,7 @@ from django.conf.urls import url |
||
4 | 4 |
|
5 | 5 |
from member import activity_mp_views, lensman_activity_mp_views |
6 | 6 |
|
7 |
+ |
|
7 | 8 |
# activity |
8 | 9 |
urlpatterns = [ |
9 | 10 |
url(r'^member/activity/home$', activity_mp_views.activity_home, name='mp_member_activity_home'), # 获取会员活动首页 |
@@ -37,8 +38,8 @@ urlpatterns += [ |
||
37 | 38 |
url(r'^member/activity/contribute/detail/lastest$', activity_mp_views.activity_contribute_detail_lastest, name='member_activity_contribute_detail_lastest'), |
38 | 39 |
] |
39 | 40 |
|
40 |
-#activity message |
|
41 |
+# activity message |
|
41 | 42 |
urlpatterns += [ |
42 | 43 |
url(r'^member/activity/message$', lensman_activity_mp_views.activity_message, name='mp_member_activity_message'), |
43 | 44 |
url(r'^member/activity/message/read$', lensman_activity_mp_views.activity_message_read, name='mp_member_activity_message_read'), |
44 |
-] |
|
45 |
+] |
@@ -5,5 +5,6 @@ |
||
5 | 5 |
# Ignoring error codes |
6 | 6 |
# -- E128 continuation line under-indented for visual indent |
7 | 7 |
# -- E501 line too long |
8 |
+# -- E731 do not assign a lambda expression, use a def |
|
8 | 9 |
|
9 |
-pycodestyle --exclude=migrations --ignore=E128,E501 . |
|
10 |
+pycodestyle --exclude=migrations --ignore=E128,E501,E731 . |