Fix Bug: User Has Not Join Group
Brightcells
4 gewijzigde bestanden met toevoegingen van 31 en 6 verwijderingen
+ 3
- 3
geo/views.py
@@ -11,8 +11,8 @@ from TimeConvert import TimeConvert as tc |
||
| 11 | 11 |
|
| 12 | 12 |
from utils.error.errno_utils import GroupUserStatusCode |
| 13 | 13 |
from utils.error.response_utils import response |
| 14 |
-from utils.redis.rkeys import (TOUR_GUIDE_GROUP_CUR_SESSION, TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_USER_BELONG, |
|
| 15 |
- TOUR_GUIDE_GROUP_USER_GEO_LIST) |
|
| 14 |
+from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_SESSION, TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_USER_GEO_LIST |
|
| 15 |
+from utils.redis.rtouruser import get_tour_user_belong_group |
|
| 16 | 16 |
|
| 17 | 17 |
|
| 18 | 18 |
r = settings.REDIS_CACHE |
@@ -25,7 +25,7 @@ def geo_submit_api(request): |
||
| 25 | 25 |
latitude = request.POST.get('lat', '') # 纬度
|
| 26 | 26 |
|
| 27 | 27 |
# 获取用户当前所处旅行团 |
| 28 |
- group_id = r.get(TOUR_GUIDE_GROUP_USER_BELONG % user_id) |
|
| 28 |
+ group_id = get_tour_user_belong_group(user_id) |
|
| 29 | 29 |
if not group_id: |
| 30 | 30 |
return response(GroupUserStatusCode.USER_HAS_NOT_JOIN_GROUP) |
| 31 | 31 |
|
+ 3
- 3
group/tourguidegroup_views.py
@@ -16,9 +16,9 @@ from group.models import GroupInfo, GroupUserInfo |
||
| 16 | 16 |
from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, TokenStatusCode, UserStatusCode |
| 17 | 17 |
from utils.error.response_utils import response |
| 18 | 18 |
from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info |
| 19 |
-from utils.redis.rkeys import (TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION, |
|
| 20 |
- TOUR_GUIDE_GROUP_USER_BELONG) |
|
| 19 |
+from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION |
|
| 21 | 20 |
from utils.redis.rtourguide import get_tour_guide_own_group, set_tour_guide_own_group |
| 21 |
+from utils.redis.rtouruser import get_tour_user_belong_group |
|
| 22 | 22 |
from utils.storage_utils import file_save |
| 23 | 23 |
|
| 24 | 24 |
|
@@ -120,7 +120,7 @@ def pai2_tginfo_api(request): |
||
| 120 | 120 |
user_id = request.POST.get('user_id', '')
|
| 121 | 121 |
|
| 122 | 122 |
# 获取用户当前所处旅行团 |
| 123 |
- group_id = r.get(TOUR_GUIDE_GROUP_USER_BELONG % user_id) |
|
| 123 |
+ group_id = get_tour_user_belong_group(user_id) |
|
| 124 | 124 |
if not group_id: |
| 125 | 125 |
return response(GroupUserStatusCode.USER_HAS_NOT_JOIN_GROUP) |
| 126 | 126 |
|
+ 4
- 0
group/tourguidegroupuser_views.py
@@ -20,6 +20,7 @@ from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GRO |
||
| 20 | 20 |
TOUR_GUIDE_GROUP_CUR_SESSION, TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_USER_GEO_LIST) |
| 21 | 21 |
from utils.redis.rprofile import get_profile_by_id |
| 22 | 22 |
from utils.redis.rtourguide import get_tour_guide_own_group |
| 23 |
+from utils.redis.rtouruser import set_tour_user_belong_group |
|
| 23 | 24 |
|
| 24 | 25 |
|
| 25 | 26 |
r = settings.REDIS_CACHE |
@@ -101,6 +102,9 @@ def tgu_group_user_join_api(request): |
||
| 101 | 102 |
# 添加默认地理位置信息 |
| 102 | 103 |
r.geoadd(TOUR_GUIDE_GROUP_GEO_INFO % group_id, 0, 0, user_id) |
| 103 | 104 |
|
| 105 |
+ # 设置旅行团成员所属的旅行团 |
|
| 106 |
+ set_tour_user_belong_group(user_id, group_id) |
|
| 107 |
+ |
|
| 104 | 108 |
return response(200, 'Tour Guide User Join Success', u'旅行团成员加团成功', {
|
| 105 | 109 |
'current_id': curinfo.get('current_id', ''),
|
| 106 | 110 |
'photos': curinfo.get('photos', ''),
|
+ 21
- 0
utils/redis/rtouruser.py
@@ -0,0 +1,21 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+ |
|
| 3 |
+from django.conf import settings |
|
| 4 |
+ |
|
| 5 |
+from utils.redis.rkeys import TOUR_GUIDE_GROUP_USER_BELONG |
|
| 6 |
+ |
|
| 7 |
+ |
|
| 8 |
+r = settings.REDIS_CACHE |
|
| 9 |
+ |
|
| 10 |
+ |
|
| 11 |
+# 旅行团成员相关 |
|
| 12 |
+ |
|
| 13 |
+ |
|
| 14 |
+def set_tour_user_belong_group(user_id, group_id): |
|
| 15 |
+ """ 设置旅行团成员所属的旅行团 """ |
|
| 16 |
+ r.set(TOUR_GUIDE_GROUP_USER_BELONG % user_id, group_id) |
|
| 17 |
+ |
|
| 18 |
+ |
|
| 19 |
+def get_tour_user_belong_group(user_id): |
|
| 20 |
+ """ 获取旅行团成员所属的旅行团 """ |
|
| 21 |
+ return r.get(TOUR_GUIDE_GROUP_USER_BELONG % user_id) |