....

apps/customer/order/serializers.py

@@ -1,8 +1,5 @@
 # coding=utf-8
-import datetime
-from django.conf import settings
-from django.utils import timezone
-from util.exceptions import CustomError
+
 from rest_framework import serializers
 from apps.activity.models import Order
 
@@ -14,13 +11,6 @@ class ActivityOrderSerializer(serializers.ModelSerializer):
         fields = ('id', 'number', 'create_time', )
 
 
-class MemberOrderSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Order
-        fields = '__all__'
-
-
 class OrderSerializer(serializers.ModelSerializer):
 
     class Meta:

apps/customer/order/urls.py

@@ -7,7 +7,6 @@ from .views import *
 
 urlpatterns = [
     url(r'^activity_order/$', ActivityOrderListView.as_view()),
-    url(r'^list/$', OrderListView.as_view()),
 ]
 router = SimpleRouter()
 router.register(r'', OrderViewSet)

apps/customer/order/views.py

@@ -16,7 +16,7 @@ from util.permission import IsCustomerUser
 from util.exceptions import CustomError
 
 from apps.foundation.models import BizLog
-from apps.customer.order.serializers import OrderSerializer, MemberOrderSerializer, ActivityOrderSerializer
+from apps.customer.order.serializers import OrderSerializer, ActivityOrderSerializer
 from apps.activity.models import Activity, Order
 from apps.activity.models import Pay
 from apps.activity.filters import OrderFilter
@@ -24,9 +24,14 @@ from apps.activity.filters import OrderFilter
 
 class OrderViewSet(ModelViewSet):
     permission_classes = [IsCustomerUser, ]
-    queryset = Order.objects.filter()
+    queryset = Order.objects.filter(delete=False)
     serializer_class = OrderSerializer
 
+    def filter_queryset(self, queryset):
+        queryset = queryset.filter(member=self.request.customer)
+        f = OrderFilter(self.request.GET, queryset=queryset)
+        return f.qs
+
     def create(self, request, *args, **kwargs):
         try:
             with transaction.atomic():
@@ -104,18 +109,3 @@ class ActivityOrderListView(generics.ListAPIView):
         except NotFound:
             return response_ok([])
         return data
-
-
-class OrderListView(generics.ListAPIView):
-    '''
-    小程序显示拼团订单--显示用户所有订单信息(删除的不显示)
-    '''
-    permission_classes = [IsCustomerUser, ]
-    queryset = Order.objects.filter(delete=False)
-    serializer_class = MemberOrderSerializer
-
-    def filter_queryset(self, queryset):
-        queryset = queryset.filter(member=self.request.customer)
-        f = OrderFilter(self.request.GET, queryset=queryset)
-        return f.qs
-

carwin_activity/settings.py

@@ -148,8 +148,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, "uis/media/")
 TMP_URL = '/tmp/'
 TMP_ROOT = os.path.join(BASE_DIR, "tmp/")
 
-APPID = ''  # 小程序appid
-SECRET = ''            # 小程序秘钥
+APPID = 'wx5f9d20a43269d37d'  # 小程序appid
+SECRET = '9626af6e3bb977a211e025cb9f68b062'            # 小程序秘钥
 AGENT_NUM = ''         # 商户号
 AGENT_KEY = ''         # 商户密钥