api/urls.py

@@ -167,5 +167,6 @@ urlpatterns += [

                 
              

                 # 首页相关
              

                 urlpatterns += [
              

                -    url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'),  # 首页信息
              

                +    url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'),  # 首页照片信息
              

                +    url(r'^pai2/tginfo$', tourguidegroup_views.pai2_tginfo_api, name='pai2_tginfo_api'),  # 首页旅行团信息
              

                 ]
              

group/models.py

@@ -79,6 +79,8 @@ class GroupInfo(CreateUpdateMixin):

                             'gather_lon': self.gather_lon,
              

                             'gather_lat': self.gather_lat,
              

                             'created_at': tc.remove_microsecond(self.created_at),
              

                +            # TODO: tour guide upload banners, include travel route, matters need attention, and so on
              

                +            'banners': [],
              

                         }
              

                 
              

                     def users(self, admin=True, user_id=None):
              

group/tourguidegroup_views.py

@@ -15,10 +15,11 @@ from TimeConvert import TimeConvert as tc

                 
              

                 from account.models import UserInfo
              

                 from group.models import GroupInfo, GroupUserInfo
              

                -from utils.error.errno_utils import GroupStatusCode, TokenStatusCode, UserStatusCode
              

                +from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, TokenStatusCode, UserStatusCode
              

                 from utils.error.response_utils import response
              

                 from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info
              

                -from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION
              

                +from utils.redis.rkeys import (TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION,
              

                +                               TOUR_GUIDE_GROUP_USER_BELONG)
              

                 from utils.redis.rtourguide import set_tour_guide_own_group
              

                 
              

                 
              
@@ -123,6 +124,27 @@ def tg_group_detail_api(request):

                 
              

                 
              

                 @logit
              

                +def pai2_tginfo_api(request):
              

                +    """
              

                +    首页旅行团信息
              

                +    :param request:
              

                +    :return:
              

                +    """
              

                +    user_id = request.POST.get('user_id', '')
              

                +
              

                +    # 获取用户当前所处旅行团
              

                +    group_id = r.get(TOUR_GUIDE_GROUP_USER_BELONG % user_id)
              

                +    if not group_id:
              

                +        return response(GroupUserStatusCode.USER_HAS_NOT_JOIN_GROUP)
              

                +
              

                +    return response(200, 'Get Tour Guide　Group Detail Info Success', u'获取旅行团详情成功', {
              

                +        'group_id': group_id,
              

                +        'group': get_group_info(group_id),
              

                +        'users': get_group_users_info(group_id, user_id),
              

                +    })
              

                +
              

                +
              

                +@logit
              

                 def tg_group_update_api(request):
              

                     """
              

                     旅行团更新
              

group/views.py

@@ -857,7 +857,7 @@ def thumbup_cancel_api(request):

                 @logit
              

                 def pai2_home_api(request):
              

                     """
              

                -    首页信息
              

                +    首页照片信息
              

                     :param request:
              

                     :return:
              

                     """