订单

apps/order/models.py

@@ -86,10 +86,11 @@ class Pay(models.Model):
         if order:
             order.status = Order.FINISH
             order.actual_amount = self.amount
-            order.save()
             if order.coupon:
+                order.coupon_deduction = order.coupon.amount
                 order.coupon.count += 1
                 order.coupon.save()
+            order.save()
 
     @staticmethod
     def getByNo(pay_no):

apps/order/serializers.py

@@ -16,6 +16,7 @@ class OrderSerializer(serializers.ModelSerializer):
 
     total_amount = PriceShowCharField(read_only=True)
     actual_amount = PriceShowCharField(read_only=True)
+    coupon_deduction = PriceShowCharField(read_only=True)
     class_text = serializers.SerializerMethodField()
 
     def get_class_text(self, obj):

apps/order/views.py

@@ -60,8 +60,12 @@ class OrderViewSet(CustomModelViewSet):
             queryset = queryset.filter(create_user=self.request.user)
         elif self.request.user.type == User.AGENT:
             # 代理商，筛选代理的类别和学校
-            queryset = queryset.filter(
-                Q(commodity__category__in=self.request.user.category) | Q(student__school=self.request.user.school))
+            if self.request.user.category:
+                category = self.request.user.category.split(',')
+                queryset = queryset.filter(commodity__category__in=category)
+            if self.request.user.school:
+                school = self.request.user.school.split(',')
+                queryset = queryset.filter(student__school=school)
 
         f = OrderFilter(self.request.GET, queryset=queryset)
         return f.qs

uis/views/employee/index.html

@@ -92,6 +92,8 @@
                 , {field: 'position', title: '职位', width: 120}
                 , {field: 'type_text', title: '类别', width: 120}
                 , {field: 'groups', title: '权限组', width: 200}
+                , {field: 'category_text', title: '管理分类', width: 200}
+                , {field: 'school_text', title: '管理学习', width: 200}
                 , {field: 'date_joined_f', title: '添加时间', width: 150}
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {width: 170, align: 'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}