group/tourguidegroupuser_views.py

@@ -232,13 +232,14 @@ def tgu_group_user_locations_api(request):

                 
              

                     # [['x', 0.33, (2.68220901489e-06, 1.26736058093e-06)], []]
              

                     locations = r.georadius(TOUR_GUIDE_GROUP_GEO_INFO % group_id, gather_info.get('gather_lon', 0), gather_info.get('gather_lat', 0), '+inf', unit='m', withdist=True, withcoord=True, sort='ASC')
              

                -    # [{'location_info': ['x', 0.33, (2.68220901489e-06, 1.26736058093e-06)], 'user_info': {}}, {}]
              

                +    # [{'lon': 2.68220901489e-06, 'lat': 26736058093e-06, 'dist': 0.33, etc...}, {}]
              

                     # 获取旅行团用户 KV 信息
              

                     group_users_kv_info = get_group_users_kv_info(group_id)
              

                -    locations = [{
              

                -        'location_info': loc,
              

                -        'user_info': group_users_kv_info[loc[0]],
              

                -    } for loc in locations]
              

                +    locations = [dict(group_users_kv_info[loc[0]], **{
              

                +        'lon': loc[2][0],
              

                +        'lat': loc[2][1],
              

                +        'dist': loc[1]
              

                +    }) for loc in locations]
              

                 
              

                     return response(200, 'Get Tour Guide Group All User Location Success', u'获取旅行团成员地理位置信息成功', {
              

                         'group_id': group_id,