d>
|
653
|
|
- 'session_id': row[22],
|
|
654
|
|
- 'nomark': row[23],
|
|
655
|
|
- 'origin': row[24],
|
|
656
|
|
- 'created_at': row[25],
|
|
657
|
|
- 'origin_expired_stamps': origin_expired_stamps(row[25], row[16]),
|
|
658
|
|
- 'thumbup': get_group_photo_thumbup_flag(row[5], user_id),
|
|
659
|
|
- 'porder': get_lensman_order_record(row[5], user_id) if row[21] == GroupPhotoInfo.SESSION_GROUP else {},
|
|
660
|
|
- 'display_payment_btn': row[21] == GroupPhotoInfo.SESSION_GROUP and row[26] not in [GroupPhotoInfo.OUTTAKE],
|
|
661
|
|
- } for row in rows]
|
|
662
|
|
-
|
|
663
|
|
- return response(200, 'Get Home Data Success', u'获取首页数据成功', {
|
|
664
|
|
- 'photos': rows,
|
|
665
|
|
- 'left': left,
|
|
666
|
|
- })
|
|
667
|
|
-
|
|
668
|
|
-
|
|
669
|
|
-@logit
|
|
670
|
|
-def lensman_photo_price(request):
|
|
671
|
|
- """ 摄影师照片价格获取 """
|
|
672
|
|
- user_id = request.POST.get('user_id', '')
|
|
673
|
|
- photo_id = request.POST.get('photo_id', '')
|
|
674
|
|
- photo_type = request.POST.get('photo_type', 'nomark') # nomark for 去除水印, origin for 获取高清图
|
|
675
|
|
-
|
|
676
|
|
- # 群组照片校验
|
|
677
|
|
- try:
|
|
678
|
|
- group_photo = GroupPhotoInfo.objects.get(photo_id=photo_id)
|
|
679
|
|
- except GroupPhotoInfo.DoesNotExist:
|
|
680
|
|
- return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
|
|
681
|
|
-
|
|
682
|
|
- return response(200, 'Get Price Success', u'获取价格成功', {
|
|
683
|
|
- 'price': get_group_photo_price(group_photo, photo_type)
|
|
684
|
|
- })
|
|
685
|
|
-
|
|
686
|
|
-
|
|
687
|
|
-@logit
|
|
688
|
|
-def lensman_photo_bought(request):
|
|
689
|
|
- """ 摄影师照片已购买 """
|
|
690
|
|
- user_id = request.POST.get('user_id', '')
|
|
691
|
|
- photo_id = request.POST.get('photo_id', '')
|
|
692
|
|
-
|
|
693
|
|
- return response(200, 'Get Bought Data Success', u'获取购买数据成功', {
|
|
694
|
|
- 'porder': get_lensman_order_record(photo_id, user_id)
|
|
695
|
|
- })
|
|
696
|
|
-
|
|
697
|
|
-
|
|
698
|
|
-class GroupInfoViewSet(viewsets.ModelViewSet):
|
|
699
|
|
- queryset = GroupInfo.objects.all().order_by('-pk')
|
|
700
|
|
- serializer_class = GroupInfoSerializer
|
|
701
|
|
-
|
|
702
|
|
-
|
|
703
|
|
-class GroupUserInfoViewSet(viewsets.ModelViewSet):
|
|
704
|
|
- queryset = GroupUserInfo.objects.all().order_by('-pk')
|
|
705
|
|
- serializer_class = GroupUserInfoSerializer
|
|
706
|
|
-
|
|
707
|
|
-
|
|
708
|
|
-class GroupPhotoInfoViewSet(viewsets.ModelViewSet):
|
|
709
|
|
- queryset = GroupPhotoInfo.objects.all().order_by('-pk')
|
|
710
|
|
- serializer_class = GroupPhotoInfoSerializer
|
|
|
7
|
+# Create your views here.
|
|
|
|
@@ -44,7 +44,7 @@ INSTALLED_APPS = (
|
|
44
|
44
|
'django.contrib.messages',
|
|
45
|
45
|
'django.contrib.staticfiles',
|
|
46
|
46
|
'rest_framework',
|
|
47
|
|
- 'django_q',
|
|
|
47
|
+ # 'django_q',
|
|
48
|
48
|
'django_rlog',
|
|
49
|
49
|
'django_uniapi',
|
|
50
|
50
|
'django_we',
|
|
|
|
@@ -22,8 +22,7 @@ from django.contrib import admin
|
|
22
|
22
|
from rest_framework import routers
|
|
23
|
23
|
|
|
24
|
24
|
from account import views as account_views
|
|
25
|
|
-from group import views as group_views
|
|
26
|
|
-from group import grouppage_views
|
|
|
25
|
+from group import group_views, grouppage_views
|
|
27
|
26
|
from miniapp import views as mini_views
|
|
28
|
27
|
from photo import views as photo_views
|
|
29
|
28
|
from website import views as website_views
|
|
|
|
@@ -20,6 +20,6 @@ class PhotosInfoAdmin(admin.ModelAdmin):
|
|
20
|
20
|
list_filter = ('lensman_id', 'status')
|
|
21
|
21
|
|
|
22
|
22
|
|
|
23
|
|
-admin.site.register(UUIDInfo, UUIDInfoAdmin)
|
|
|
23
|
+# admin.site.register(UUIDInfo, UUIDInfoAdmin)
|
|
24
|
24
|
admin.site.register(PhotosInfo, PhotosInfoAdmin)
|
|
25
|
25
|
admin.site.register(PhotoUUIDInfo, PhotoUUIDInfoAdmin)
|
|
|
|
@@ -3,7 +3,7 @@
|
|
3
|
3
|
from curtail_uuid import CurtailUUID
|
|
4
|
4
|
from django.db import transaction
|
|
5
|
5
|
from django.shortcuts import render
|
|
6
|
|
-from django_q.tasks import async
|
|
|
6
|
+# from django_q.tasks import async
|
|
7
|
7
|
from django_response import response
|
|
8
|
8
|
from ipaddr import client_ip
|
|
9
|
9
|
from logit import logit
|
|
|
|
@@ -46,13 +46,13 @@ def uuid(request):
|
|
46
|
46
|
# 从 Redis 中 Pop 中指定数量的 UUID
|
|
47
|
47
|
uuids, succeed, left = r.multi_pop(UUID_LIST, num)
|
|
48
|
48
|
|
|
49
|
|
- # 异步更新 UUID 数据库中状态
|
|
50
|
|
- if uuids:
|
|
51
|
|
- async(update_uuids, lensman_id, uuids)
|
|
52
|
|
-
|
|
53
|
|
- # 当可用 UUID 数量少于 500 时, 异步创建
|
|
54
|
|
- if left < 500:
|
|
55
|
|
- async(generate_uuids)
|
|
|
49
|
+ # # 异步更新 UUID 数据库中状态
|
|
|
50
|
+ # if uuids:
|
|
|
51
|
+ # async(update_uuids, lensman_id, uuids)
|
|
|
52
|
+ #
|
|
|
53
|
+ # # 当可用 UUID 数量少于 500 时, 异步创建
|
|
|
54
|
+ # if left < 500:
|
|
|
55
|
+ # async(generate_uuids)
|
|
56
|
56
|
|
|
57
|
57
|
return response(200, 'Get UUID Success', u'获取唯一标识成功', uuids)
|
|
58
|
58
|
|
|
|
|
@@ -1,4 +1,3 @@
|
|
1
|
|
--e git+https://github.com/Brightcells/django-q.git#egg=django-q
|
|
2
|
1
|
CodeConvert==2.0.4
|
|
3
|
2
|
Django==1.11.9
|
|
4
|
3
|
MySQL-python==1.2.5
|