group/tourguidegroup_views.py

@@ -102,10 +102,16 @@ def tg_group_create_api(request):

                     })
              

                 
              

                 
              

                -def set_geo_submit_flag(uinfo, geo_dt):
              

                +def set_geo_submit_flag(uinfo, geo_at, gather_at):
              

                     uinfo['geo_submited'] = False
              

                -    if geo_dt:
              

                -        pass
              

                +    if geo_at and gather_at:
              

                +        current_dt = tc.utc_datetime()
              

                +        delta_seconds = tc.total_seconds(gather_at - current_dt)
              

                +        # 距离集合时间超过30分钟是5分钟，15分钟到30分钟是3分钟，15分钟以内是1分钟
              

                +        for delta, gdt in [(1800, 300), (900, 180), (0, 60)]:
              

                +            if delta_seconds > delta:
              

                +                uinfo['geo_submited'] = tc.total_seconds(current_dt - geo_at) <= gdt
              

                +                break
              

                     return uinfo
              

                 
              

                 
              
@@ -115,13 +121,21 @@ def tg_group_detail_api(request):

                     group_id = request.POST.get('group_id', '')
              

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

                 
              

                +    # GEO last submit datetimes
              

                     geo_dts = r.hgetall(TOUR_GUIDE_GROUP_GEO_SUBMIT_DT % group_id)
              

                 
              

                +    group_info = get_group_info(group_id)
              

                +    # Gather datetime
              

                +    gather_at = group_info.get('gather_at', '')
              

                +    gather_at = tc.utc_string_to_utc_datetime(gather_at, format='%Y-%m-%dT%H:%M:%SZ') if isinstance(gather_at, basestring) else gather_at
              

                +    if gather_at and tc.utc_datetime() > gather_at:
              

                +        gather_at = ''
              

                +
              

                     group_users_info = get_group_users_info(group_id, user_id)
              

                     # Remove tourguide
              

                     group_passed_users = [uinfo for uinfo in group_users_info['passed'] if not uinfo['subadmin']]
              

                     # GEO Submited Flag
              

                -    group_passed_users = [set_geo_submit_flag(uinfo, geo_dts.get(uinfo['user_id'], '')) for uinfo in group_passed_users]
              

                +    group_passed_users = [set_geo_submit_flag(uinfo, tc.utc_string_to_utc_datetime(geo_dts.get(uinfo['user_id'], '')), gather_at) for uinfo in group_passed_users]
              

                     group_users_info['passed'] = group_passed_users
              

                     # Update passed count
              

                     group_users_info['passed_count'] = len(group_passed_users)
              
@@ -130,7 +144,7 @@ def tg_group_detail_api(request):

                 
              

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

                         'group_id': group_id,
              

                -        'group': get_group_info(group_id),
              

                +        'group': group_info,
              

                         'users': group_users_info,
              

                     })