api/distributor_views.py

@@ -2,6 +2,7 @@

                 
              

                 from __future__ import division
              

                 
              

                +from django.conf import settings
              

                 from django_logit import logit
              

                 from django_models_ext import ProvinceShortModelMixin
              

                 from django_response import response
              
@@ -111,7 +112,7 @@ def distributor_list(request):

                     except AdministratorInfo.DoesNotExist:
              

                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                 
              

                -    distributors = DistributorInfo.objects.filter(brand_id=administrator.brand_id, status=True).order_by('-pk')
              

                +    distributors = DistributorInfo.objects.filter(brand_id=administrator.brand_id, status=True).order_by('position', '-pk')
              

                     count = distributors.count()
              

                     distributors, left = pagination(distributors, page, num)
              

                     distributors = [distributor.admindata for distributor in distributors]
              
@@ -121,3 +122,14 @@ def distributor_list(request):

                         'count': count,
              

                         'left': left,
              

                     })
              

                +
              

                +
              

                +def distributor_all(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +
              

                +    distributors = DistributorInfo.objects.filter(brand_id=brand_id, status=True).order_by('position', '-pk')
              

                +    distributors = [distributor.admindata for distributor in distributors]
              

                +
              

                +    return response(200, 'Get Distributor List Success', u'获取经销商列表成功', {
              

                +        'distributors': distributors,
              

                +    })
              

api/urls.py

@@ -269,6 +269,7 @@ urlpatterns += [

                     url(r'^distributor/delete$', distributor_views.distributor_delete, name='distributor_delete'),
              

                     url(r'^distributor/update$', distributor_views.distributor_update, name='distributor_update'),
              

                     url(r'^distributor/list$', distributor_views.distributor_list, name='distributor_list'),
              

                +    url(r'^distributor/all$', distributor_views.distributor_all, name='distributor_all'),
              

                 ]
              

                 
              

                 urlpatterns += [