Home Explore Help
Register Sign In
Pai2
/
pai2
Watch 2
Star 0
Fork 0

Browse Source
Add pai2_tginfo_api

Brightcells 8 years ago
parent
70f5faad11
commit
6611c5f373
4 changed files with 29 additions and 4 deletions
Show Diff Stats
  1. 2 1
      api/urls.py
  2. 2 0
      group/models.py
  3. 24 2
      group/tourguidegroup_views.py
  4. 1 1
      group/views.py

+ 2 - 1
api/urls.py
View File 

@@ -167,5 +167,6 @@ urlpatterns += [
167 167
168 168 
 # 首页相关
169 169 
 urlpatterns += [
170 
-    url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'),  # 首页信息
170 
+    url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'),  # 首页照片信息
171 
+    url(r'^pai2/tginfo$', tourguidegroup_views.pai2_tginfo_api, name='pai2_tginfo_api'),  # 首页旅行团信息
171 172 
 ]

+ 2 - 0
group/models.py
View File 

@@ -79,6 +79,8 @@ class GroupInfo(CreateUpdateMixin):
79 79 
             'gather_lon': self.gather_lon,
80 80 
             'gather_lat': self.gather_lat,
81 81 
             'created_at': tc.remove_microsecond(self.created_at),
82 
+            # TODO: tour guide upload banners, include travel route, matters need attention, and so on
83 
+            'banners': [],
82 84 
         }
83 85
84 86 
     def users(self, admin=True, user_id=None):

+ 24 - 2
group/tourguidegroup_views.py
View File 

@@ -15,10 +15,11 @@ from TimeConvert import TimeConvert as tc
15 15
16 16 
 from account.models import UserInfo
17 17 
 from group.models import GroupInfo, GroupUserInfo
18 
-from utils.error.errno_utils import GroupStatusCode, TokenStatusCode, UserStatusCode
18 
+from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, TokenStatusCode, UserStatusCode
19 19 
 from utils.error.response_utils import response
20 20 
 from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info
21 
-from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION
21 
+from utils.redis.rkeys import (TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION,
22 
+                               TOUR_GUIDE_GROUP_USER_BELONG)
22 23 
 from utils.redis.rtourguide import set_tour_guide_own_group
23 24
24 25 
 
@@ -123,6 +124,27 @@ def tg_group_detail_api(request):
123 124
124 125
125 126 
 @logit
127 
+def pai2_tginfo_api(request):
128 
+    """
129 
+    首页旅行团信息
130 
+    :param request:
131 
+    :return:
132 
+    """
133 
+    user_id = request.POST.get('user_id', '')
134 
+
135 
+    # 获取用户当前所处旅行团
136 
+    group_id = r.get(TOUR_GUIDE_GROUP_USER_BELONG % user_id)
137 
+    if not group_id:
138 
+        return response(GroupUserStatusCode.USER_HAS_NOT_JOIN_GROUP)
139 
+
140 
+    return response(200, 'Get Tour Guide　Group Detail Info Success', u'获取旅行团详情成功', {
141 
+        'group_id': group_id,
142 
+        'group': get_group_info(group_id),
143 
+        'users': get_group_users_info(group_id, user_id),
144 
+    })
145 
+
146 
+
147 
+@logit
126 148 
 def tg_group_update_api(request):
127 149 
     """
128 150 
     旅行团更新

+ 1 - 1
group/views.py
View File 

@@ -857,7 +857,7 @@ def thumbup_cancel_api(request):
857 857 
 @logit
858 858 
 def pai2_home_api(request):
859 859 
     """
860 
-    首页信息
860 
+    首页照片信息
861 861 
     :param request:
862 862 
     :return:
863 863 
     """