api接口

apps/account/models.py

@@ -3,7 +3,6 @@
 from django.db import models
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, Group, PermissionsMixin
 from django.utils import timezone
-from django.conf import settings
 
 from utils.exceptions import CustomError
 from apps.foundation.consts import CONTENT_TYPE_SORTING, MENU_TO_MODEL

apps/account/serializers.py

@@ -8,7 +8,6 @@ from rest_framework_jwt.settings import api_settings
 from apps.foundation.models import BizLog
 from apps.account import tenant_log
 from utils import get_remote_addr
-from utils.exceptions import CustomError
 
 User = get_user_model()
 jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER

apps/account/views.py

@@ -5,10 +5,8 @@ from rest_framework.serializers import ValidationError
 from utils.custom_modelviewset import CustomModelViewSet
 from utils import response_error, response_ok
 from .serializers import *
-from .models import User
 from apps.account import tenant_log
 from apps.foundation.models import BizLog
-from django.contrib.auth.decorators import login_required
 from .filters import *
 
 class LoginView(ObtainJSONWebToken):

apps/customer/models.py

@@ -1,6 +1,5 @@
 # coding=utf-8
 
-import requests
 from django.db import transaction
 from django.db import models
 from django.utils import timezone

apps/customer/serializers.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 from rest_framework import serializers
 from apps.customer.models import Customer, CustomerVehicle
-from utils.exceptions import CustomError
 
 
 class CustomerSerializer(serializers.ModelSerializer):

apps/customer/views.py

@@ -1,22 +1,15 @@
 # coding=utf-8
-import requests
-import json
 from django.db import transaction
 from rest_framework.decorators import action
-from django.utils import timezone
 from utils import response_ok
 
-from utils.permission import permission_required
 from utils.custom_modelviewset import CustomModelViewSet
-from utils.exceptions import CustomError
-from apps.foundation.models import BizLog, Config
+from apps.foundation.models import BizLog
 from apps.account import tenant_log
 from apps.images.models import Images
 from apps.customer.models import Customer, CustomerVehicle
-from apps.vehicle.models import Brand
 from apps.customer.filters import CustomerFilter, CustomerVehicleFilter
 from .serializers import CustomerSerializer, CustomerVehicleSerializer
-from hashlib import md5
 
 
 class CustomerViewSet(CustomModelViewSet):

apps/foundation/views.py

@@ -2,10 +2,8 @@
 import json
 from django.db import transaction
 from rest_framework.views import APIView
-from rest_framework.decorators import action
 from utils import response_ok
 from utils.custom_modelviewset import CustomModelViewSet
-from utils.exceptions import CustomError
 from apps.foundation.models import BizLog, Option, Config
 from apps.account import tenant_log
 from .filters import OptionFilter, ConfigFilter, BizLogFilter

apps/maint_order/models.py

@@ -1,13 +1,11 @@
 # coding=utf-8
 
 from django.db import models
-from django.conf import settings
 
 from apps.foundation.models import Option
-from apps.vehicle.models import Model, Series
+from apps.vehicle.models import Series
 from apps.customer.models import Customer
 from apps.store.models import Shop
-from apps.images.models import Images
 
 
 

apps/maint_order/serializers.py

@@ -1,12 +1,7 @@
 # coding=utf-8
 
-from django.conf import settings
 
 from rest_framework import serializers
-
-from utils.exceptions import CustomError
-
-from apps.base import Formater
 from .models import MaintOrderReserve
 
 class MaintOrderReserveSerializer(serializers.ModelSerializer):

apps/product/models.py

@@ -5,7 +5,6 @@ from django.conf import settings
 
 from apps.foundation.models import Option
 from apps.images.models import Images
-from apps.customer.models import Customer, CustomerAddress
 
 
 class Product(models.Model):

apps/product_order/models.py

@@ -1,9 +1,7 @@
 # coding=utf-8
 
 from django.db import models
-from django.conf import settings
 
-from apps.foundation.models import Option
 from apps.product.models import Product
 from apps.customer.models import Customer, CustomerAddress
 

apps/product_order/serializers.py

@@ -1,14 +1,7 @@
 # coding=utf-8
 
-from django.conf import settings
-
 from rest_framework import serializers
-
-from utils.exceptions import CustomError
-
 from apps.base import Formater
-from apps.images.models import Images
-
 from .models import ProductOrder
 
 class ProductOrderSerializer(serializers.ModelSerializer):

apps/usedvehicle/models.py

@@ -1,10 +1,6 @@
 #coding=utf-8
-import json
-import datetime
 
 from django.db import models
-from django.utils import timezone
-from django.conf import settings
 from apps.foundation.models import Option
 from apps.images.models import Images
 

apps/usedvehicle/views.py

@@ -1,12 +1,11 @@
 # coding=utf-8
 
 from django.db import transaction
-from rest_framework.views import APIView
 from rest_framework.decorators import action
 from utils import response_ok
 from utils.custom_modelviewset import CustomModelViewSet
 from utils.exceptions import CustomError
-from apps.foundation.models import BizLog, Option
+from apps.foundation.models import BizLog
 from apps.account import tenant_log
 from .filters import *
 from .serializers import *

apps/vehicle/serializers.py

@@ -1,12 +1,10 @@
 # coding=utf-8
 
-import json
 from django.conf import settings
 from rest_framework import serializers
 from apps.vehicle.models import Brand, Series, Model, VehicleImg
 from apps.images.models import Images
 from utils.booleancharfield import PriceShowCharField
-from utils.exceptions import CustomError
 from apps.base import Formater
 
 

apps/vehicle/views.py

@@ -1,13 +1,11 @@
 # coding=utf-8
 
-import json
-import ast
 from django.db import transaction
 from rest_framework.decorators import action
 from rest_framework.views import APIView
 from django.db.models import Q
 from utils import response_ok
-from utils.permission import permission_required, isLogin
+from utils.permission import isLogin
 from utils.custom_modelviewset import CustomModelViewSet
 from utils.exceptions import CustomError
 from apps.images.models import Images

apps/vehicle_order/filters.py

@@ -2,10 +2,10 @@
 
 import django_filters
 
-from .models import VhicleDriveReserve, VhicleInquiry, UsedVhicleInquiry, UsedVhicleEstimate
+from .models import VehicleDriveReserve, VehicleInquiry, UsedVehicleInquiry, UsedVehicleEstimate
 
 
-class VhicleDriveReserveFilter(django_filters.FilterSet):
+class VehicleDriveReserveFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
     shop = django_filters.CharFilter(field_name='shop')
@@ -14,11 +14,11 @@ class VhicleDriveReserveFilter(django_filters.FilterSet):
     customer = django_filters.CharFilter(field_name='customer')
 
     class Meta:
-        model = VhicleDriveReserve
+        model = VehicleDriveReserve
         fields = '__all__'
 
 
-class VhicleInquiryFilter(django_filters.FilterSet):
+class VehicleInquiryFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
     shop = django_filters.CharFilter(field_name='shop')
@@ -27,11 +27,11 @@ class VhicleInquiryFilter(django_filters.FilterSet):
     customer = django_filters.CharFilter(field_name='customer')
 
     class Meta:
-        model = VhicleInquiry
+        model = VehicleInquiry
         fields = '__all__'
 
 
-class UsedVhicleInquiryFilter(django_filters.FilterSet):
+class UsedVehicleInquiryFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     tel = django_filters.CharFilter(field_name='customer__tel', lookup_expr='icontains')
     brand = django_filters.CharFilter(field_name='brand')
@@ -40,12 +40,12 @@ class UsedVhicleInquiryFilter(django_filters.FilterSet):
     customer = django_filters.CharFilter(field_name='customer')
 
     class Meta:
-        model = UsedVhicleInquiry
+        model = UsedVehicleInquiry
         fields = '__all__'
 
 
 
-class UsedVhicleEstimateFilter(django_filters.FilterSet):
+class UsedVehicleEstimateFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='customer__name', lookup_expr='icontains')
     tel = django_filters.CharFilter(field_name='customer__tel', lookup_expr='icontains')
     brand = django_filters.CharFilter(field_name='brand')
@@ -54,7 +54,7 @@ class UsedVhicleEstimateFilter(django_filters.FilterSet):
     customer = django_filters.CharFilter(field_name='customer')
 
     class Meta:
-        model = UsedVhicleEstimate
+        model = UsedVehicleEstimate
         fields = '__all__'
 
 

apps/vehicle_order/models.py

@@ -10,7 +10,7 @@ from apps.store.models import Shop
 from apps.images.models import Images
 
 
-class VhicleDriveReserve(models.Model):
+class VehicleDriveReserve(models.Model):
     WAIT_DRIVE = 1
     FINISHED = 2
     REVOKE = 3
@@ -41,7 +41,7 @@ class VhicleDriveReserve(models.Model):
         default_permissions = ()
 
 
-class VhicleInquiry(models.Model):
+class VehicleInquiry(models.Model):
     WAIT_VISIT = 1
     VISITED = 2
     STATUS_CHOICES = (
@@ -67,7 +67,7 @@ class VhicleInquiry(models.Model):
         default_permissions = ()
 
 
-class UsedVhicleInquiry(models.Model):
+class UsedVehicleInquiry(models.Model):
     WAIT_VISIT = 1
     VISITED = 2
     STATUS_CHOICES = (
@@ -93,7 +93,7 @@ class UsedVhicleInquiry(models.Model):
         default_permissions = ()
 
 
-class UsedVhicleEstimate(models.Model):
+class UsedVehicleEstimate(models.Model):
     WAIT_VISIT = 1
     VISITED = 2
     STATUS_CHOICES = (

apps/vehicle_order/serializers.py

@@ -4,13 +4,9 @@ from django.conf import settings
 
 from rest_framework import serializers
 
-from utils.exceptions import CustomError
+from .models import VehicleDriveReserve, VehicleInquiry, UsedVehicleInquiry, UsedVehicleEstimate
 
-from apps.base import Formater
-
-from .models import VhicleDriveReserve, VhicleInquiry, UsedVhicleInquiry, UsedVhicleEstimate
-
-class VhicleDriveReserveSerializer(serializers.ModelSerializer):
+class VehicleDriveReserveSerializer(serializers.ModelSerializer):
     shop_name = serializers.CharField(source='shop.name', read_only=True)
     brand_name = serializers.CharField(source='model.series.brand.name', read_only=True)
     series_name = serializers.CharField(source='model.series.name', read_only=True)
@@ -33,11 +29,11 @@ class VhicleDriveReserveSerializer(serializers.ModelSerializer):
         return ''
 
     class Meta:
-        model = VhicleDriveReserve
+        model = VehicleDriveReserve
         fields = '__all__'
 
 
-class VhicleInquirySerializer(serializers.ModelSerializer):
+class VehicleInquirySerializer(serializers.ModelSerializer):
     shop_name = serializers.CharField(source='shop.name', read_only=True)
     brand_name = serializers.CharField(source='model.series.brand.name', read_only=True)
     series_name = serializers.CharField(source='model.series.name', read_only=True)
@@ -51,11 +47,11 @@ class VhicleInquirySerializer(serializers.ModelSerializer):
         return obj.displace and u'是' or u'否'
 
     class Meta:
-        model = VhicleInquiry
+        model = VehicleInquiry
         fields = '__all__'
 
 
-class UsedVhicleInquirySerializer(serializers.ModelSerializer):
+class UsedVehicleInquirySerializer(serializers.ModelSerializer):
     brand_name = serializers.CharField(source='brand.name', read_only=True)
     customer_name = serializers.CharField(source='customer.name', read_only=True)
     customer_tel = serializers.CharField(source='customer.tel', read_only=True)
@@ -64,11 +60,11 @@ class UsedVhicleInquirySerializer(serializers.ModelSerializer):
     create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
 
     class Meta:
-        model = UsedVhicleInquiry
+        model = UsedVehicleInquiry
         fields = '__all__'
 
 
-class UsedVhicleEstimateSerializer(serializers.ModelSerializer):
+class UsedVehicleEstimateSerializer(serializers.ModelSerializer):
     brand_name = serializers.CharField(source='brand.name', read_only=True)
     customer_name = serializers.CharField(source='customer.name', read_only=True)
     customer_tel = serializers.CharField(source='customer.tel', read_only=True)
@@ -77,6 +73,6 @@ class UsedVhicleEstimateSerializer(serializers.ModelSerializer):
     plate_date = serializers.DateField(format='%Y-%m-%d')
 
     class Meta:
-        model = UsedVhicleEstimate
+        model = UsedVehicleEstimate
         fields = '__all__'
 

apps/vehicle_order/urls.py

@@ -10,8 +10,8 @@ urlpatterns = [
 ]
 
 router = SimpleRouter()
-router.register(r'drive_reserve', VhicleDriveReserveViewSet)
-router.register(r'inquiry', VhicleInquiryViewSet)
-router.register(r'usedvehicle_inquiry', UsedVhicleInquiryViewSet)
-router.register(r'usedvehicle_estimate', UsedVhicleEstimateViewSet)
+router.register(r'drive_reserve', VehicleDriveReserveViewSet)
+router.register(r'inquiry', VehicleInquiryViewSet)
+router.register(r'usedvehicle_inquiry', UsedVehicleInquiryViewSet)
+router.register(r'usedvehicle_estimate', UsedVehicleEstimateViewSet)
 urlpatterns += router.urls

apps/vehicle_order/views.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
 from django.db import transaction
-
+from utils.exceptions import CustomError
 from rest_framework.decorators import action
 
 from utils import response_ok
@@ -14,82 +14,82 @@ from .serializers import *
 from .models import *
 
 
-class VhicleDriveReserveViewSet(CustomModelViewSet):
-    queryset = VhicleDriveReserve.objects.filter(delete=False)
-    serializer_class = VhicleDriveReserveSerializer
+class VehicleDriveReserveViewSet(CustomModelViewSet):
+    queryset = VehicleDriveReserve.objects.filter(delete=False)
+    serializer_class = VehicleDriveReserveSerializer
 
     def filter_queryset(self, queryset):
-        f = VhicleDriveReserveFilter(self.request.GET, queryset=queryset)
+        f = VehicleDriveReserveFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     @action(methods=['post'], detail=True)
     def change_status(self, request, pk):
-        order = VhicleDriveReserve.objects.filter(id=pk).first()
+        order = VehicleDriveReserve.objects.filter(id=pk).first()
         status = request.GET.get('status')
         with transaction.atomic():
             order.status = int(status)
             order.save()
-            tenant_log(self.request.user, BizLog.UPDATE, u'修改试驾单状态[%s]，id=%d' % (VhicleDriveReserve.STATUS_CHOICES[order.status-1][1], order.id))
+            tenant_log(self.request.user, BizLog.UPDATE, u'修改试驾单状态[%s]，id=%d' % (VehicleDriveReserve.STATUS_CHOICES[order.status-1][1], order.id))
         return response_ok()
 
 
-class VhicleInquiryViewSet(CustomModelViewSet):
-    queryset = VhicleInquiry.objects.filter(delete=False)
-    serializer_class = VhicleInquirySerializer
+class VehicleInquiryViewSet(CustomModelViewSet):
+    queryset = VehicleInquiry.objects.filter(delete=False)
+    serializer_class = VehicleInquirySerializer
 
     def filter_queryset(self, queryset):
-        f = VhicleInquiryFilter(self.request.GET, queryset=queryset)
+        f = VehicleInquiryFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     @action(methods=['post'], detail=True)
     def visit(self, request, pk):
-        order = VhicleInquiry.objects.filter(id=pk).first()
+        order = VehicleInquiry.objects.filter(id=pk).first()
         with transaction.atomic():
-            if order.status != VhicleInquiry.WAIT_VISIT:
+            if order.status != VehicleInquiry.WAIT_VISIT:
                 raise CustomError(u'当前状态不允许修改！')
-            order.status = VhicleInquiry.VISITED
+            order.status = VehicleInquiry.VISITED
             order.save()
             tenant_log(self.request.user, BizLog.UPDATE, u'新车询价单回访，id=%d' % (order.id))
         return response_ok()
 
 
 
-class UsedVhicleInquiryViewSet(CustomModelViewSet):
-    queryset = UsedVhicleInquiry.objects.filter(delete=False)
-    serializer_class = UsedVhicleInquirySerializer
+class UsedVehicleInquiryViewSet(CustomModelViewSet):
+    queryset = UsedVehicleInquiry.objects.filter(delete=False)
+    serializer_class = UsedVehicleInquirySerializer
 
     def filter_queryset(self, queryset):
-        f = UsedVhicleInquiryFilter(self.request.GET, queryset=queryset)
+        f = UsedVehicleInquiryFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     @action(methods=['post'], detail=True)
     def visit(self, request, pk):
-        order = UsedVhicleInquiry.objects.filter(id=pk).first()
+        order = UsedVehicleInquiry.objects.filter(id=pk).first()
         with transaction.atomic():
-            if order.status != UsedVhicleInquiry.WAIT_VISIT:
+            if order.status != UsedVehicleInquiry.WAIT_VISIT:
                 raise CustomError(u'当前状态不允许修改！')
-            order.status = UsedVhicleInquiry.VISITED
+            order.status = UsedVehicleInquiry.VISITED
             order.save()
             tenant_log(self.request.user, BizLog.UPDATE, u'二手车询价单回访，id=%d' % (order.id))
         return response_ok()
 
 
 
-class UsedVhicleEstimateViewSet(CustomModelViewSet):
-    queryset = UsedVhicleEstimate.objects.filter(delete=False)
-    serializer_class = UsedVhicleEstimateSerializer
+class UsedVehicleEstimateViewSet(CustomModelViewSet):
+    queryset = UsedVehicleEstimate.objects.filter(delete=False)
+    serializer_class = UsedVehicleEstimateSerializer
 
     def filter_queryset(self, queryset):
-        f = UsedVhicleEstimateFilter(self.request.GET, queryset=queryset)
+        f = UsedVehicleEstimateFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     @action(methods=['post'], detail=True)
     def visit(self, request, pk):
-        order = UsedVhicleEstimate.objects.filter(id=pk).first()
+        order = UsedVehicleEstimate.objects.filter(id=pk).first()
         with transaction.atomic():
-            if order.status != UsedVhicleEstimate.WAIT_VISIT:
+            if order.status != UsedVehicleEstimate.WAIT_VISIT:
                 raise CustomError(u'当前状态不允许修改！')
-            order.status = UsedVhicleEstimate.VISITED
+            order.status = UsedVehicleEstimate.VISITED
             order.save()
             tenant_log(self.request.user, BizLog.UPDATE, u'二手车预估单回访，id=%d' % (order.id))
         return response_ok()

apps/wechat/activity/serializers.py

@@ -1,6 +1,5 @@
 # coding=utf-8
 
-from utils.exceptions import CustomError
 from django.utils import timezone
 from django.conf import settings
 from rest_framework import serializers

apps/wechat/activity/views.py

@@ -1,18 +1,8 @@
 # coding=utf-8
 
-from django.utils import timezone
-from django.db import transaction
-from django.db.models import F
-from django.conf import settings
-from rest_framework import generics, mixins
-from rest_framework.views import APIView
-from rest_framework.viewsets import GenericViewSet
-from rest_framework.decorators import action
-from rest_framework.exceptions import NotFound
+from rest_framework import generics
 
 from utils import response_ok
-from utils.permission import IsCustomerUser
-from utils.exceptions import CustomError
 from .serializers import ActivitySerializer
 from apps.activity.models import Activity
 from apps.activity.filters import ActivityFilter

apps/wechat/customer/serializers.py

@@ -1,9 +1,8 @@
 # coding=utf-8
 
-from django.conf import settings
 from django.db.models import Q
 from rest_framework import serializers
-from apps.customer.models import CustomerVehicle, CustomerAddress
+from apps.customer.models import *
 from apps.vehicle_order.models import *
 from apps.product_order.models import *
 from apps.base import Formater
@@ -66,7 +65,7 @@ class ProductOrderSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
-class VhicleDriveReserveSerializer(serializers.ModelSerializer):
+class VehicleDriveReserveSerializer(serializers.ModelSerializer):
     shop_name = serializers.CharField(source='shop.name', read_only=True)
     brand_name = serializers.CharField(source='model.series.brand.name', read_only=True)
     series_name = serializers.CharField(source='model.series.name', read_only=True)
@@ -89,11 +88,11 @@ class VhicleDriveReserveSerializer(serializers.ModelSerializer):
         return ''
 
     class Meta:
-        model = VhicleDriveReserve
+        model = VehicleDriveReserve
         fields = '__all__'
 
 
-class VhicleInquirySerializer(serializers.ModelSerializer):
+class VehicleInquirySerializer(serializers.ModelSerializer):
     shop_name = serializers.CharField(source='shop.name', read_only=True)
     brand_name = serializers.CharField(source='model.series.brand.name', read_only=True)
     series_name = serializers.CharField(source='model.series.name', read_only=True)
@@ -107,11 +106,11 @@ class VhicleInquirySerializer(serializers.ModelSerializer):
         return obj.displace and u'是' or u'否'
 
     class Meta:
-        model = VhicleInquiry
+        model = VehicleInquiry
         fields = '__all__'
 
 
-class UsedVhicleInquirySerializer(serializers.ModelSerializer):
+class UsedVehicleInquirySerializer(serializers.ModelSerializer):
     brand_name = serializers.CharField(source='brand.name', read_only=True)
     customer_name = serializers.CharField(source='customer.name', read_only=True)
     customer_tel = serializers.CharField(source='customer.tel', read_only=True)
@@ -120,11 +119,11 @@ class UsedVhicleInquirySerializer(serializers.ModelSerializer):
     create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
 
     class Meta:
-        model = UsedVhicleInquiry
+        model = UsedVehicleInquiry
         fields = '__all__'
 
 
-class UsedVhicleEstimateSerializer(serializers.ModelSerializer):
+class UsedVehicleEstimateSerializer(serializers.ModelSerializer):
     brand_name = serializers.CharField(source='brand.name', read_only=True)
     customer_name = serializers.CharField(source='customer.name', read_only=True)
     customer_tel = serializers.CharField(source='customer.tel', read_only=True)
@@ -133,6 +132,6 @@ class UsedVhicleEstimateSerializer(serializers.ModelSerializer):
     plate_date = serializers.DateField(format='%Y-%m-%d')
 
     class Meta:
-        model = UsedVhicleEstimate
+        model = UsedVehicleEstimate
         fields = '__all__'
 

apps/wechat/customer/urls.py

@@ -6,10 +6,10 @@ from rest_framework.routers import SimpleRouter
 from .views import *
 
 urlpatterns = [
-    url(r'^drive_reserve/$', VhicleDriveReserveViewSet.as_view()),
-    url(r'^inquiry/$', VhicleInquiryViewSet.as_view()),
-    url(r'^usedvehicle_inquiry/$', UsedVhicleInquiryViewSet.as_view()),
-    url(r'^usedvehicle_estimate/$', UsedVhicleEstimateViewSet.as_view()),
+    url(r'^drive_reserve/$', VehicleDriveReserveViewSet.as_view()),
+    url(r'^inquiry/$', VehicleInquiryViewSet.as_view()),
+    url(r'^usedvehicle_inquiry/$', UsedVehicleInquiryViewSet.as_view()),
+    url(r'^usedvehicle_estimate/$', UsedVehicleEstimateViewSet.as_view()),
     url(r'^product_order/$', ProductOrderViewSet.as_view()),
     url(r'^vehicles/$', CustomerVehicleViewSet.as_view()),
     url(r'^address/$', CustomerAddressViewSet.as_view()),

apps/wechat/customer/views.py

@@ -5,7 +5,6 @@ from django.db import transaction
 from rest_framework.decorators import action
 from rest_framework import generics
 from utils import response_ok
-from utils.custom_modelviewset import CustomModelViewSet
 from apps.account import tenant_log
 from apps.foundation.models import BizLog
 from rest_framework.exceptions import NotFound
@@ -16,65 +15,65 @@ from apps.vehicle_order.filters import *
 from apps.product_order.filters import *
 
 
-class VhicleDriveReserveViewSet(generics.ListAPIView):
-    queryset = VhicleDriveReserve.objects.filter(delete=False)
-    serializer_class = VhicleDriveReserveSerializer
+class VehicleDriveReserveViewSet(generics.ListAPIView):
+    queryset = VehicleDriveReserve.objects.filter(delete=False)
+    serializer_class = VehicleDriveReserveSerializer
 
     def filter_queryset(self, queryset):
-        f = VhicleDriveReserveFilter(self.request.GET, queryset=queryset)
+        f = VehicleDriveReserveFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     def list(self, request, *args, **kwargs):
         try:
-            data = super(VhicleDriveReserveViewSet, self).list(request)
+            data = super(VehicleDriveReserveViewSet, self).list(request)
         except NotFound:
             return response_ok([])
         return data
 
 
-class VhicleInquiryViewSet(generics.ListAPIView):
-    queryset = VhicleInquiry.objects.filter(delete=False)
-    serializer_class = VhicleInquirySerializer
+class VehicleInquiryViewSet(generics.ListAPIView):
+    queryset = VehicleInquiry.objects.filter(delete=False)
+    serializer_class = VehicleInquirySerializer
 
     def filter_queryset(self, queryset):
-        f = VhicleInquiryFilter(self.request.GET, queryset=queryset)
+        f = VehicleInquiryFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     def list(self, request, *args, **kwargs):
         try:
-            data = super(VhicleInquiryViewSet, self).list(request)
+            data = super(VehicleInquiryViewSet, self).list(request)
         except NotFound:
             return response_ok([])
         return data
 
 
-class UsedVhicleInquiryViewSet(generics.ListAPIView):
-    queryset = UsedVhicleInquiry.objects.filter(delete=False)
-    serializer_class = UsedVhicleInquirySerializer
+class UsedVehicleInquiryViewSet(generics.ListAPIView):
+    queryset = UsedVehicleInquiry.objects.filter(delete=False)
+    serializer_class = UsedVehicleInquirySerializer
 
     def filter_queryset(self, queryset):
-        f = UsedVhicleInquiryFilter(self.request.GET, queryset=queryset)
+        f = UsedVehicleInquiryFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     def list(self, request, *args, **kwargs):
         try:
-            data = super(UsedVhicleInquiryViewSet, self).list(request)
+            data = super(UsedVehicleInquiryViewSet, self).list(request)
         except NotFound:
             return response_ok([])
         return data
 
 
-class UsedVhicleEstimateViewSet(generics.ListAPIView):
-    queryset = UsedVhicleEstimate.objects.filter(delete=False)
-    serializer_class = UsedVhicleEstimateSerializer
+class UsedVehicleEstimateViewSet(generics.ListAPIView):
+    queryset = UsedVehicleEstimate.objects.filter(delete=False)
+    serializer_class = UsedVehicleEstimateSerializer
 
     def filter_queryset(self, queryset):
-        f = UsedVhicleEstimateFilter(self.request.GET, queryset=queryset)
+        f = UsedVehicleEstimateFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     def list(self, request, *args, **kwargs):
         try:
-            data = super(UsedVhicleEstimateViewSet, self).list(request)
+            data = super(UsedVehicleEstimateViewSet, self).list(request)
         except NotFound:
             return response_ok([])
         return data

apps/wechat/product/serializers.py

@@ -4,8 +4,7 @@ from django.conf import settings
 from rest_framework import serializers
 from apps.product.models import Product, ProductImg
 from apps.base import Formater
-from apps.customer.models import Customer
-from apps.foundation.models import Option, Config
+from apps.foundation.models import Option
 
 
 class ProductSerializer(serializers.ModelSerializer):

apps/wechat/product/views.py

@@ -1,24 +1,14 @@
 # coding=utf-8
 
-from django.db import transaction
-from django.db.models import F
-from django.conf import settings
-
-from rest_framework import generics, mixins
-from rest_framework.viewsets import GenericViewSet
-from rest_framework.views import APIView
-from rest_framework.decorators import action
+from rest_framework import generics
 from rest_framework.exceptions import NotFound
 
 from utils import response_ok
-from utils.permission import IsCustomerUser
 from utils.exceptions import CustomError
 
 from apps.product.models import Product
 from apps.product.filters import ProductFilter
-from apps.account import tenant_log
-from apps.foundation.models import BizLog, Option
-from apps.customer.models import Customer
+from apps.foundation.models import  Option
 from apps.foundation.filters import OptionFilter
 
 from .serializers import ProductSerializer, ProductDetailSerializer, ProductTypeSerializer

apps/wechat/serializers.py

@@ -9,7 +9,6 @@ from rest_framework_jwt.settings import api_settings
 
 from apps.customer.models import Customer, CustomerWechat, CustomerAddress
 from apps.foundation.models import BizLog, Config
-from apps.base import Formater
 from utils.exceptions import CustomError
 from apps.account import tenant_log
 

apps/wechat/store/serializers.py

@@ -1,7 +1,5 @@
 # coding=utf-8
 
-from django.conf import settings
-
 from rest_framework import serializers
 from apps.store.models import Shop
 

apps/wechat/store/views.py

@@ -1,13 +1,9 @@
 # coding=utf-8
 
-from rest_framework import generics, mixins
-from rest_framework.viewsets import GenericViewSet
+from rest_framework import generics
 
-from utils.permission import IsCustomerUser
-from utils.exceptions import CustomError
 from utils import response_ok
 
-from apps.store.models import Shop
 from apps.store.filters import ShopFilter
 
 from .serializers import *

apps/wechat/usedvehicle/serializers.py

@@ -2,7 +2,6 @@
 
 from django.conf import settings
 from rest_framework import serializers
-from apps.base import Formater
 from apps.usedvehicle.models import UsedVehicle, UsedVehicleImg
 from apps.foundation.models import Option
 

apps/wechat/usedvehicle/views.py

@@ -1,25 +1,14 @@
 # coding=utf-8
 
-from django.db import transaction
-from django.db.models import F
-from django.conf import settings
-
-from rest_framework import generics, mixins
-from rest_framework.viewsets import GenericViewSet
+from rest_framework import generics
 from rest_framework.views import APIView
-from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
 
 from utils import response_ok
-from utils.permission import IsCustomerUser
 from utils.exceptions import CustomError
 
-from apps.product.models import Product
 from apps.usedvehicle.filters import UsedVehicleFilter
-from apps.account import tenant_log
-from apps.foundation.models import BizLog, Option
-from apps.customer.models import Customer
-from apps.foundation.filters import OptionFilter
+from apps.foundation.models import Option
 from apps.usedvehicle.models import UsedVehicle
 
 from .serializers import UsedVehicleSerializer, UsedVehicleDetailSerializer, UsedVehicleOptionSerializer

apps/wechat/vehicle/serializers.py

@@ -1,10 +1,7 @@
 # coding=utf-8
-
-from utils.exceptions import CustomError
-from django.utils import timezone
 from django.conf import settings
 from rest_framework import serializers
-from apps.vehicle.models import Series, Brand, Model, VehicleImg
+from apps.vehicle.models import Series, Model, VehicleImg
 from utils.booleancharfield import PriceShowCharField
 from apps.store.models import Shop, StoreBrand
 

apps/wechat/vehicle/views.py

@@ -1,20 +1,10 @@
 # coding=utf-8
 
-from django.utils import timezone
-from django.db import transaction
-from django.db.models import F
-from django.conf import settings
-from rest_framework import generics, mixins
-from rest_framework.views import APIView
-from rest_framework.viewsets import GenericViewSet
-from rest_framework.decorators import action
-from rest_framework.exceptions import NotFound
+from rest_framework import generics
 
 from utils import response_ok
-from utils.permission import IsCustomerUser
 from utils.exceptions import CustomError
 from .serializers import SeriesSerializer, ModelSerializer, ModelDetailSerializer
-from apps.activity.models import Activity
 from apps.vehicle.filters import SeriesFilter, ModelFilter
 from apps.vehicle.models import Series, Model
 

apps/wechat/views.py

@@ -1,24 +1,14 @@
 # coding=utf-8
 
-import requests
 from django.db import transaction
 from rest_framework.views import APIView
 from rest_framework import generics
-from rest_framework.decorators import action
-from rest_framework_jwt.views import ObtainJSONWebToken,VerifyJSONWebToken,RefreshJSONWebToken
+from rest_framework_jwt.views import VerifyJSONWebToken,RefreshJSONWebToken
 from rest_framework.serializers import ValidationError
-from rest_framework import permissions
 
 from utils import response_ok, response_error
-from utils.exceptions import CustomError
-from utils.custom_modelviewset import CustomModelViewSet
 from utils.wx.WXBizDataCrypt import WXBizDataCrypt
 from utils.permission import IsCustomerUser
-from apps.images.models import Images
-from apps.customer.models import CustomerAddress
-from apps.customer.filters import CustomerAddressFilter
-from apps.foundation.models import Config
-from apps.account import tenant_log
 
 
 from .serializers import *