feat: add discount_amount to payment_order and receipt_order, and change total_amount logic

api_v1/views/business/receipt/views.py

@@ -11,15 +11,30 @@ from api_v1.views.stock_change_views.mixins import StockChangeViewMixin
 class ReceiptOrderSerializer(serializers.ModelSerializer):
     customer_name = serializers.CharField(source='customer.name', read_only=True)
     operator_name = serializers.CharField(source='operator.name', read_only=True)
+    bank_account_name = serializers.CharField(source='bank_account.name', read_only=True)
+    settlement_amount = serializers.SerializerMethodField()
 
     class Meta:
         model = business_models.ReceiptOrder
         fields = [
-            'id', 'customer', 'customer_name', 'receipt_date',
-            'amount', 'operator', 'operator_name', 'status',
-            'remarks', 'created_at', 'updated_at',
+            'id', 'customer', 'customer_name', 'bank_account', 'bank_account_name',
+            'receipt_date', 'amount', 'discount_amount', 'settlement_amount',
+            'operator', 'operator_name', 'status',
+            'remarks', 'markup', 'created_at', 'updated_at',
         ]
-        read_only_fields = ['id', 'customer_name', 'operator_name', 'status', 'created_at', 'updated_at']
+        read_only_fields = [
+            'id',
+            'customer_name',
+            'operator_name',
+            'bank_account_name',
+            'settlement_amount',
+            'status',
+            'created_at',
+            'updated_at',
+        ]
+
+    def get_settlement_amount(self, obj):
+        return str(obj.settlement_amount)
 
 
 class ReceiptOrderPagination(pagination.LimitOffsetPagination):
@@ -35,9 +50,11 @@ class ReceiptOrderView(StockChangeViewMixin, views.APIView):
         if not self.check_employee_permission(request):
             return self.permission_error_response('无权限访问')
         merchant = request.user.employee.merchant
-        queryset = business_models.ReceiptOrder.objects.filter(merchant=merchant).select_related(
-            'customer', 'operator'
-        ).order_by('-created_at')
+        queryset = (
+            business_models.ReceiptOrder.objects.filter(merchant=merchant)
+            .select_related('customer', 'operator', 'bank_account')
+            .order_by('-created_at')
+        )
         paginator = self.pagination_class()
         page = paginator.paginate_queryset(queryset, request, view=self)
         serializer = ReceiptOrderSerializer(page, many=True)
@@ -51,6 +68,9 @@ class ReceiptOrderView(StockChangeViewMixin, views.APIView):
         customer_id = data.get('customer')
         receipt_date = data.get('receipt_date')
         amount = data.get('amount')
+        discount_amount = data.get('discount_amount')
+        bank_account_id = data.get('bank_account')
+        markup = data.get('markup')
         remarks = data.get('remarks', '')
 
         if not customer_id:
@@ -66,6 +86,12 @@ class ReceiptOrderView(StockChangeViewMixin, views.APIView):
             return Response({'error': f'客户 {customer_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
 
         operator = request.user.employee
+        bank_account = None
+        if bank_account_id not in (None, '', 0):
+            try:
+                bank_account = basic_models.BankAccount.objects.get(id=bank_account_id, merchant=merchant)
+            except basic_models.BankAccount.DoesNotExist:
+                return Response({'error': '银行账户不存在'}, status=status.HTTP_400_BAD_REQUEST)
 
         try:
             receipt_order = business_services.create_receipt_order(
@@ -73,8 +99,11 @@ class ReceiptOrderView(StockChangeViewMixin, views.APIView):
                 customer=customer,
                 receipt_date=receipt_date,
                 amount=amount,
+                discount_amount=discount_amount,
                 operator=operator,
                 remarks=remarks,
+                bank_account=bank_account,
+                markup=markup,
             )
         except ValueError as exc:
             return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
@@ -106,9 +135,10 @@ class ReceiptOrderReviewView(StockChangeViewMixin, views.APIView):
 
         merchant = request.user.employee.merchant
         try:
-            receipt_order = business_models.ReceiptOrder.objects.select_related(
-                'customer', 'operator'
-            ).get(id=pk, merchant=merchant)
+            receipt_order = (
+                business_models.ReceiptOrder.objects.select_related('customer', 'operator', 'bank_account')
+                .get(id=pk, merchant=merchant)
+            )
         except business_models.ReceiptOrder.DoesNotExist:
             return self.not_found_response('收款单不存在')
 
@@ -126,8 +156,9 @@ class ReceiptOrderReviewView(StockChangeViewMixin, views.APIView):
         except ValueError as exc:
             return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
 
-        refreshed = business_models.ReceiptOrder.objects.select_related(
-            'customer', 'operator'
-        ).get(id=receipt_order.id)
+        refreshed = (
+            business_models.ReceiptOrder.objects.select_related('customer', 'operator', 'bank_account')
+            .get(id=receipt_order.id)
+        )
         return Response(ReceiptOrderSerializer(refreshed).data, status=status.HTTP_200_OK)