增加activity_list_v2

FFIB hace 1 año
padre
commit
9e90a53e89
Se han modificado 2 ficheros con 15 adiciones y 1 borrados
  1. 14 1
      member/activity_mp_views.py
  2. 1 0
      member/mp_urls.py

+ 14 - 1
member/activity_mp_views.py

@@ -39,12 +39,25 @@ def activity_list(request):
39 39
     })
40 40
 
41 41
 @logit
42
+def activity_list_v2(request):
43
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
44
+    user_id = request.POST.get('user_id', '')
45
+    activity_section = request.POST.get('activity_section', 3)
46
+
47
+    activitys = MemberActivityInfo.objects.filter(activity_state=1, activity_section=activity_section, main_activity_id='', status=True).order_by('-date')
48
+    activitys = [act.data(user_id) for act in activitys]
49
+
50
+    return response(data={
51
+        'activitys': activitys,
52
+    })
53
+
54
+@logit
42 55
 def activity_series_list(request):
43 56
     brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
44 57
     user_id = request.POST.get('user_id', '')
45 58
     main_activity_id = request.POST.get('main_activity_id', '')
46 59
 
47
-    activitys = MemberActivityInfo.objects.filter(main_activity_id=main_activity_id, status=True).order_by('-date')
60
+    activitys = MemberActivityInfo.objects.filter(activity_state=1, main_activity_id=main_activity_id, status=True).order_by('-date')
48 61
     activitys = [act.data(user_id) for act in activitys]
49 62
 
50 63
     return response(data={

+ 1 - 0
member/mp_urls.py

@@ -8,6 +8,7 @@ from member import activity_mp_views
8 8
 urlpatterns = [
9 9
     url(r'^member/activity/home$', activity_mp_views.activity_home, name='mp_member_activity_home'),  # 获取会员活动首页
10 10
     url(r'^member/activity/list$', activity_mp_views.activity_list, name='mp_member_activity_list'),  # 获取会员分区活动列表
11
+    url(r'^member/activity/list/v2$', activity_mp_views.activity_list_v2, name='mp_member_activity_list_v2'),  # 获取会员分区活动列表
11 12
     url(r'^member/activity/series/list$', activity_mp_views.activity_series_list, name='mp_member_activity_series_list'),  # 获取会员系列活动列表
12 13
     url(r'^member/activity/detail$', activity_mp_views.activity_detail, name='mp_member_activity_detail'),  # 获取会员分区活动详情
13 14
 ]