num-old">
15
|
12
|
""" 设置群组信息 """
|
|
16
|
|
- group_data = group.data
|
|
17
|
|
- r.setexjson(GROUP_INFO % group.group_id, r.REDIS_EXPIRED_ONE_MONTH, group_data, cls=DjangoJSONEncoder)
|
|
18
|
|
- return group_data
|
|
|
13
|
+ r.setexjson(GROUP_INFO % group.group_id, r.REDIS_EXPIRED_ONE_MONTH, group.data, cls=DjangoJSONEncoder)
|
|
|
14
|
+ return group.data
|
|
19
|
15
|
|
|
20
|
16
|
|
|
21
|
17
|
def set_group_info_by_id(group_id):
|
|
|
|
@@ -107,19 +103,19 @@ def get_group_photo_thumbup_flag(photo_id, user_id):
|
|
107
|
103
|
""" 获取群组照片用户点赞标识信息 """
|
|
108
|
104
|
if r.exists(GROUP_PHOTO_THUMB_UP % (photo_id, user_id)):
|
|
109
|
105
|
return True
|
|
110
|
|
- else:
|
|
111
|
|
- from group.models import PhotoThumbUpInfo
|
|
112
|
|
- if PhotoThumbUpInfo.objects.filter(photo_id=photo_id, user_id=user_id, thumbup=True).exists():
|
|
113
|
|
- set_group_photo_thumbup_flag(photo_id, user_id)
|
|
114
|
|
- return True
|
|
115
|
|
- else:
|
|
116
|
|
- return False
|
|
|
106
|
+
|
|
|
107
|
+ from group.models import PhotoThumbUpInfo
|
|
|
108
|
+ if PhotoThumbUpInfo.objects.filter(photo_id=photo_id, user_id=user_id, thumbup=True, status=True).exists():
|
|
|
109
|
+ set_group_photo_thumbup_flag(photo_id, user_id)
|
|
|
110
|
+ return True
|
|
|
111
|
+
|
|
|
112
|
+ return False
|
|
117
|
113
|
|
|
118
|
114
|
|
|
119
|
115
|
def set_group_photo_comment_list(photo_id):
|
|
120
|
116
|
""" 设置群组照片用户评论列表 """
|
|
121
|
117
|
from group.models import PhotoCommentInfo
|
|
122
|
|
- photo_comments = PhotoCommentInfo.objects.filter(photo_id=photo_id)
|
|
|
118
|
+ photo_comments = PhotoCommentInfo.objects.filter(photo_id=photo_id, status=True)
|
|
123
|
119
|
photo_comments = [comment.comment_info for comment in photo_comments]
|
|
124
|
120
|
r.setjson(GROUP_PHOTO_COMMENT_LIST % photo_id, photo_comments, cls=DjangoJSONEncoder)
|
|
125
|
121
|
return photo_comments
|
|
|
|
@@ -133,7 +129,7 @@ def get_group_photo_comment_list(photo_id):
|
|
133
|
129
|
def set_group_photo_thumbup_list(photo_id):
|
|
134
|
130
|
""" 设置群组照片用户点赞列表 """
|
|
135
|
131
|
from group.models import PhotoThumbUpInfo
|
|
136
|
|
- photo_thumbups = PhotoThumbUpInfo.objects.filter(photo_id=photo_id, thumbup=True)
|
|
|
132
|
+ photo_thumbups = PhotoThumbUpInfo.objects.filter(photo_id=photo_id, thumbup=True, status=True)
|
|
137
|
133
|
photo_thumbups = [thumbup.thumbup_info for thumbup in photo_thumbups]
|
|
138
|
134
|
r.setjson(GROUP_PHOTO_THUMB_UP_LIST % photo_id, photo_thumbups, cls=DjangoJSONEncoder)
|
|
139
|
135
|
return photo_thumbups
|
|
|
|
@@ -4,20 +4,17 @@ from utils.redis.connect import r
|
|
4
|
4
|
from utils.redis.rkeys import GUEST_ENTRANCE_CONTROL_INFO
|
|
5
|
5
|
|
|
6
|
6
|
|
|
7
|
|
-# 游客入口控制相关
|
|
8
|
|
-
|
|
9
|
|
-
|
|
10
|
7
|
def set_guest_entrance_control(gen):
|
|
11
|
8
|
""" 设置游客入口控制 """
|
|
12
|
|
- r.setjson(GUEST_ENTRANCE_CONTROL_INFO, gen.data)
|
|
|
9
|
+ r.setjson(GUEST_ENTRANCE_CONTROL_INFO % gen.src, gen.data)
|
|
13
|
10
|
return gen.data
|
|
14
|
11
|
|
|
15
|
12
|
|
|
16
|
|
-def get_guest_entrance_control():
|
|
|
13
|
+def get_guest_entrance_control(src=0):
|
|
17
|
14
|
""" 获取游客入口控制 """
|
|
18
|
|
- return r.getjson(GUEST_ENTRANCE_CONTROL_INFO)
|
|
|
15
|
+ return r.getjson(GUEST_ENTRANCE_CONTROL_INFO % src)
|
|
19
|
16
|
|
|
20
|
17
|
|
|
21
|
|
-def delete_guest_entrance_control():
|
|
|
18
|
+def delete_guest_entrance_control(src=0):
|
|
22
|
19
|
""" 删除游客入口控制 """
|
|
23
|
|
- return r.delete(GUEST_ENTRANCE_CONTROL_INFO)
|
|
|
20
|
+ return r.delete(GUEST_ENTRANCE_CONTROL_INFO % src)
|
|
|
|
@@ -1,7 +1,7 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
3
|
# 唯一标识相关
|
|
4
|
|
-UUID_LIST = 'uuid:list' # List, 唯一标识列表
|
|
|
4
|
+UUID_LIST = 'uuid:list' # List，唯一标识列表
|
|
5
|
5
|
|
|
6
|
6
|
# 用户相关
|
|
7
|
7
|
PROFILE_INFO = 'profile:info:%s' # STRING，用户信息，user_id
|
|
|
|
@@ -59,7 +59,7 @@ SYSTEM_MESSAGE_READ_INFO = 'system:message:read:info:%s' # STRING，系统消
|
|
59
|
59
|
SYSTEM_MESSAGE_DELETED_INFO = 'system:message:deleted:info:%s' # STRING，系统消息删除信息，user_id
|
|
60
|
60
|
|
|
61
|
61
|
# 游客入口相关
|
|
62
|
|
-GUEST_ENTRANCE_CONTROL_INFO = 'guest:entrance:control:info' # STRING，游客入口控制信息
|
|
|
62
|
+GUEST_ENTRANCE_CONTROL_INFO = 'guest:entrance:control:info:%s' # STRING，游客入口控制信息，src
|
|
63
|
63
|
|
|
64
|
64
|
# APP 相关
|
|
65
|
65
|
LATEST_APP_INFO = 'latest:app:info:%s' # STRING，最新 APP 信息，src
|
|
|
|
@@ -1,15 +1,12 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
|
-from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo
|
|
4
|
3
|
from utils.redis.connect import r
|
|
5
|
4
|
from utils.redis.rkeys import SYSTEM_MESSAGE_DELETED_INFO, SYSTEM_MESSAGE_READ_INFO
|
|
6
|
5
|
|
|
7
|
6
|
|
|
8
|
|
-# 系统消息相关
|
|
9
|
|
-
|
|
10
|
|
-
|
|
11
|
7
|
def set_system_message_read_info(user_id):
|
|
12
|
8
|
""" 设置系统消息读取信息 """
|
|
|
9
|
+ from message.models import SystemMessageReadInfo
|
|
13
|
10
|
read_messages = SystemMessageReadInfo.objects.filter(user_id=user_id, status=True)
|
|
14
|
11
|
read_message_ids = [msg.msg_id for msg in read_messages]
|
|
15
|
12
|
r.setexjson(SYSTEM_MESSAGE_READ_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, read_message_ids)
|
|
|
|
@@ -23,6 +20,7 @@ def get_system_message_read_info(user_id):
|
|
23
|
20
|
|
|
24
|
21
|
def set_system_message_delete_info(user_id):
|
|
25
|
22
|
""" 设置系统消息删除信息 """
|
|
|
23
|
+ from message.models import SystemMessageDeleteInfo
|
|
26
|
24
|
deleted_messages = SystemMessageDeleteInfo.objects.filter(user_id=user_id, status=True)
|
|
27
|
25
|
deleted_message_ids = [msg.msg_id for msg in deleted_messages]
|
|
28
|
26
|
r.setexjson(SYSTEM_MESSAGE_DELETED_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, deleted_message_ids)
|
|
|
|
@@ -6,14 +6,10 @@ from utils.redis.connect import r
|
|
6
|
6
|
from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD
|
|
7
|
7
|
|
|
8
|
8
|
|
|
9
|
|
-# 摄影师照片购买记录相关
|
|
10
|
|
-
|
|
11
|
|
-
|
|
12
|
9
|
def set_lensman_order_record(porder):
|
|
13
|
10
|
""" 设置摄影师照片购买记录 """
|
|
14
|
|
- porder_info = porder.porder_info
|
|
15
|
|
- r.setexjson(LENSMAN_PHOTO_ORDER_RECORD % (porder.photo_id, porder.user_id), r.REDIS_EXPIRED_ONE_MONTH, porder_info, cls=DjangoJSONEncoder)
|
|
16
|
|
- return porder_info
|
|
|
11
|
+ r.setexjson(LENSMAN_PHOTO_ORDER_RECORD % (porder.photo_id, porder.user_id), r.REDIS_EXPIRED_ONE_MONTH, porder.porder_info, cls=DjangoJSONEncoder)
|
|
|
12
|
+ return porder.porder_info
|
|
17
|
13
|
|
|
18
|
14
|
|
|
19
|
15
|
def set_lensman_order_record_by_id(photo_id, user_id):
|
|
|
|
@@ -1,15 +1,12 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
|
-from account.models import LensmanInfo
|
|
4
|
3
|
from utils.redis.connect import r
|
|
5
|
4
|
from utils.redis.rkeys import LENSMAN_PHOTO_PRICE_FIXED
|
|
6
|
5
|
|
|
7
|
6
|
|
|
8
|
|
-# 最新 APP 相关
|
|
9
|
|
-
|
|
10
|
|
-
|
|
11
|
7
|
def set_lensman_price_fixed(user_id):
|
|
12
|
8
|
""" 设置摄影师价格设定 """
|
|
|
9
|
+ from account.models import LensmanInfo
|
|
13
|
10
|
try:
|
|
14
|
11
|
lensman = LensmanInfo.objects.get(lensman_id=user_id)
|
|
15
|
12
|
except LensmanInfo.DoesNotExist:
|
|
|
|
@@ -4,9 +4,6 @@ from utils.redis.connect import r
|
|
4
|
4
|
from utils.redis.rkeys import PROFILE_INFO
|
|
5
|
5
|
|
|
6
|
6
|
|
|
7
|
|
-# 用户相关
|
|
8
|
|
-
|
|
9
|
|
-
|
|
10
|
7
|
def set_profile_info(user):
|
|
11
|
8
|
""" 设置用户信息 """
|
|
12
|
9
|
r.setjson(PROFILE_INFO % user.user_id, user.data)
|
|
|
|
@@ -4,9 +4,6 @@ from utils.redis.connect import r
|
|
4
|
4
|
from utils.redis.rkeys import TOUR_GUIDE_GROUP_USER_OWN
|
|
5
|
5
|
|
|
6
|
6
|
|
|
7
|
|
-# 导游相关
|
|
8
|
|
-
|
|
9
|
|
-
|
|
10
|
7
|
def set_tour_guide_own_group(user_id, group_id):
|
|
11
|
8
|
""" 设置导游拥有的旅行团 """
|
|
12
|
9
|
r.set(TOUR_GUIDE_GROUP_USER_OWN % user_id, group_id)
|
|
|
|
@@ -4,9 +4,6 @@ from utils.redis.connect import r
|
|
4
|
4
|
from utils.redis.rkeys import TOUR_GUIDE_GROUP_USER_BELONG
|
|
5
|
5
|
|
|
6
|
6
|
|
|
7
|
|
-# 旅行团成员相关
|
|
8
|
|
-
|
|
9
|
|
-
|
|
10
|
7
|
def set_tour_user_belong_group(user_id, group_id):
|
|
11
|
8
|
""" 设置旅行团成员所属的旅行团 """
|
|
12
|
9
|
r.set(TOUR_GUIDE_GROUP_USER_BELONG % user_id, group_id)
|