zuowei/erpnew
1
0
Fork 0
forked from erp-dev/erp
Code Pull Requests Activity

feat: payment order and receipt order

Browse Source
This commit is contained in:
colaftc
2025-11-30 21:52:36 +08:00
parent ce1954ad58
commit 9006a530d1
12 changed files with 900 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
api_v1/business/README.md
View File

@@ -104,7 +104,41 @@
---
## 4. 错误示例
## 4. 付款单（PaymentOrder）
### 4.1 列表
- **GET** `/api/v1/payment-orders/`
- 返回字段：`supplier_name`、`payment_date`、`amount`、`status` 等。
### 4.2 创建
- **POST** `/api/v1/payment-orders/`
| 字段 | 类型 | 说明 |
|------|------|------|
| `supplier` | int | 供应商 ID |
| `payment_date` | str (`YYYY-MM-DD`) | 付款日期 |
| `amount` | decimal | 付款金额（必须 > 0） |
| `remarks` | str | 可选 |
### 4.3 审批 / 作废
- **POST** `/api/v1/payment-orders/<id>/review/`
- `{"action": "approve"}` 或 `{"action": "cancel"}`
---
## 5. 收款单（ReceiptOrder）
接口与付款单类似，只是主体为 `customer`：
- **GET** `/api/v1/receipt-orders/`
- **POST** `/api/v1/receipt-orders/`：需要 `customer`、`receipt_date`、`amount`
- **POST** `/api/v1/receipt-orders/<id>/review/`
审批通过表示“确认收款”，作废则恢复为初始状态。
---
## 6. 错误示例
| 场景 | HTTP | 返回体 |
|------|------|--------|

133
api_v1/business/payment/views.py Normal file
View File

@@ -0,0 +1,133 @@
from rest_framework import status, views, serializers, pagination
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from basic_info import models as basic_models
from business import services as business_services
from business import models as business_models
from api_v1.views.stock_change_views.mixins import StockChangeViewMixin
class PaymentOrderSerializer(serializers.ModelSerializer):
supplier_name = serializers.CharField(source='supplier.name', read_only=True)
operator_name = serializers.CharField(source='operator.name', read_only=True)
class Meta:
model = business_models.PaymentOrder
fields = [
'id', 'supplier', 'supplier_name', 'payment_date',
'amount', 'operator', 'operator_name', 'status',
'remarks', 'created_at', 'updated_at',
]
read_only_fields = ['id', 'supplier_name', 'operator_name', 'status', 'created_at', 'updated_at']
class PaymentOrderPagination(pagination.LimitOffsetPagination):
default_limit = 20
max_limit = 100
class PaymentOrderView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
pagination_class = PaymentOrderPagination
def get(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
queryset = business_models.PaymentOrder.objects.filter(merchant=merchant).select_related(
'supplier', 'operator'
).order_by('-created_at')
paginator = self.pagination_class()
page = paginator.paginate_queryset(queryset, request, view=self)
serializer = PaymentOrderSerializer(page, many=True)
return paginator.get_paginated_response(serializer.data)
def post(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
data = request.data or {}
supplier_id = data.get('supplier')
payment_date = data.get('payment_date')
amount = data.get('amount')
remarks = data.get('remarks', '')
if not supplier_id:
return Response({'error': '缺少供应商 ID'}, status=status.HTTP_400_BAD_REQUEST)
if not payment_date:
return Response({'error': '缺少 payment_date'}, status=status.HTTP_400_BAD_REQUEST)
if amount is None:
return Response({'error': '缺少 amount'}, status=status.HTTP_400_BAD_REQUEST)
try:
supplier = basic_models.Supplier.objects.get(id=supplier_id, merchant=merchant)
except basic_models.Supplier.DoesNotExist:
return Response({'error': f'供应商 {supplier_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
operator = request.user.employee
try:
payment_order = business_services.create_payment_order(
merchant=merchant,
supplier=supplier,
payment_date=payment_date,
amount=amount,
operator=operator,
remarks=remarks,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
return Response(
{
'id': payment_order.id,
'status': payment_order.status,
'message': '付款单创建成功，等待审批',
},
status=status.HTTP_201_CREATED,
)
class PaymentOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])
class PaymentOrderReviewView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
ACTION_STATUS_MAP = {
'approve': business_models.PaymentOrderStatusEnum.APPROVED,
'cancel': business_models.PaymentOrderStatusEnum.CANCELLED,
}
def post(self, request, pk: int):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
payment_order = business_models.PaymentOrder.objects.select_related(
'supplier', 'operator'
).get(id=pk, merchant=merchant)
except business_models.PaymentOrder.DoesNotExist:
return self.not_found_response('付款单不存在')
serializer = PaymentOrderReviewSerializer(data=request.data or {})
serializer.is_valid(raise_exception=True)
action = serializer.validated_data['action']
target_status = self.ACTION_STATUS_MAP[action]
try:
business_services.review_payment_order(
payment_order=payment_order,
target_status=target_status,
reviewed_by=request.user,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
refreshed = business_models.PaymentOrder.objects.select_related(
'supplier', 'operator'
).get(id=payment_order.id)
return Response(PaymentOrderSerializer(refreshed).data, status=status.HTTP_200_OK)

133
api_v1/business/receipt/views.py Normal file
View File

@@ -0,0 +1,133 @@
from rest_framework import status, views, serializers, pagination
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from basic_info import models as basic_models
from business import services as business_services
from business import models as business_models
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)
class Meta:
model = business_models.ReceiptOrder
fields = [
'id', 'customer', 'customer_name', 'receipt_date',
'amount', 'operator', 'operator_name', 'status',
'remarks', 'created_at', 'updated_at',
]
read_only_fields = ['id', 'customer_name', 'operator_name', 'status', 'created_at', 'updated_at']
class ReceiptOrderPagination(pagination.LimitOffsetPagination):
default_limit = 20
max_limit = 100
class ReceiptOrderView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
pagination_class = ReceiptOrderPagination
def get(self, request):
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')
paginator = self.pagination_class()
page = paginator.paginate_queryset(queryset, request, view=self)
serializer = ReceiptOrderSerializer(page, many=True)
return paginator.get_paginated_response(serializer.data)
def post(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
data = request.data or {}
customer_id = data.get('customer')
receipt_date = data.get('receipt_date')
amount = data.get('amount')
remarks = data.get('remarks', '')
if not customer_id:
return Response({'error': '缺少客户 ID'}, status=status.HTTP_400_BAD_REQUEST)
if not receipt_date:
return Response({'error': '缺少 receipt_date'}, status=status.HTTP_400_BAD_REQUEST)
if amount is None:
return Response({'error': '缺少 amount'}, status=status.HTTP_400_BAD_REQUEST)
try:
customer = basic_models.Customer.objects.get(id=customer_id, merchant=merchant)
except basic_models.Customer.DoesNotExist:
return Response({'error': f'客户 {customer_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
operator = request.user.employee
try:
receipt_order = business_services.create_receipt_order(
merchant=merchant,
customer=customer,
receipt_date=receipt_date,
amount=amount,
operator=operator,
remarks=remarks,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
return Response(
{
'id': receipt_order.id,
'status': receipt_order.status,
'message': '收款单创建成功，等待审批',
},
status=status.HTTP_201_CREATED,
)
class ReceiptOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])
class ReceiptOrderReviewView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
ACTION_STATUS_MAP = {
'approve': business_models.ReceiptOrderStatusEnum.APPROVED,
'cancel': business_models.ReceiptOrderStatusEnum.CANCELLED,
}
def post(self, request, pk: int):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
receipt_order = business_models.ReceiptOrder.objects.select_related(
'customer', 'operator'
).get(id=pk, merchant=merchant)
except business_models.ReceiptOrder.DoesNotExist:
return self.not_found_response('收款单不存在')
serializer = ReceiptOrderReviewSerializer(data=request.data or {})
serializer.is_valid(raise_exception=True)
action = serializer.validated_data['action']
target_status = self.ACTION_STATUS_MAP[action]
try:
business_services.review_receipt_order(
receipt_order=receipt_order,
target_status=target_status,
reviewed_by=request.user,
)
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)
return Response(ReceiptOrderSerializer(refreshed).data, status=status.HTTP_200_OK)

119
api_v1/tests.py
View File

@@ -11,6 +11,7 @@ from rest_framework import status
from basic_info.models import (
Customer,
Employee,
EmployeeStatusEnum,
Merchant,
MerchantTypeEnum,
Product,
@@ -450,6 +451,124 @@ class SalesOrderAPITestCase(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
order = business_models.SalesOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.SalesOrderStatusEnum.PENDING)
class PaymentOrderAPITestCase(TestCase):
def setUp(self):
self.merchant = Merchant.objects.create(name='付款商户', type=MerchantTypeEnum.FACTORY)
self.supplier = Supplier.objects.create(merchant=self.merchant, name='付款供应商')
self.user = User.objects.create_user(username='pay_user', password='pass123')
self.employee = Employee.objects.create(
merchant=self.merchant,
sys_user=self.user,
name='财务',
status=EmployeeStatusEnum.ACTIVE,
)
self.client = APIClient()
self.client.force_authenticate(user=self.user)
self.payload = {
'supplier': self.supplier.id,
'payment_date': '2025-11-26',
'amount': '120.5',
'remarks': '付款备注',
}
def test_create_payment_order_success(self):
response = self.client.post('/api/v1/payment-orders/', self.payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertIn('id', response.data)
def test_create_payment_order_invalid_supplier(self):
payload = {**self.payload, 'supplier': 999}
response = self.client.post('/api/v1/payment-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
def test_review_payment_order(self):
resp = self.client.post('/api/v1/payment-orders/', self.payload, format='json')
order_id = resp.data['id']
response = self.client.post(f'/api/v1/payment-orders/{order_id}/review/', {'action': 'approve'}, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['status'], business_models.PaymentOrderStatusEnum.APPROVED)
response_cancel = self.client.post(
f'/api/v1/payment-orders/{order_id}/review/',
{'action': 'cancel'},
format='json',
)
self.assertEqual(response_cancel.status_code, status.HTTP_200_OK)
self.assertEqual(response_cancel.data['status'], business_models.PaymentOrderStatusEnum.CANCELLED)
def test_payment_order_requires_amount(self):
payload = {**self.payload}
payload.pop('amount')
response = self.client.post('/api/v1/payment-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('缺少 amount', response.data['error'])
def test_payment_order_amount_must_be_positive(self):
payload = {**self.payload, 'amount': '0'}
response = self.client.post('/api/v1/payment-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('amount 必须大于 0', response.data['error'])
class ReceiptOrderAPITestCase(TestCase):
def setUp(self):
self.merchant = Merchant.objects.create(name='收款商户', type=MerchantTypeEnum.FACTORY)
self.customer = Customer.objects.create(
merchant=self.merchant,
name='客户C',
mobile='13812345678',
created_by=None,
)
self.user = User.objects.create_user(username='receipt_user', password='pass123')
self.employee = Employee.objects.create(
merchant=self.merchant,
sys_user=self.user,
name='财务员',
status=EmployeeStatusEnum.ACTIVE,
)
self.client = APIClient()
self.client.force_authenticate(user=self.user)
self.payload = {
'customer': self.customer.id,
'receipt_date': '2025-11-26',
'amount': '88.00',
'remarks': '收款备注',
}
def test_create_receipt_order_success(self):
response = self.client.post('/api/v1/receipt-orders/', self.payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertIn('id', response.data)
def test_create_receipt_order_invalid_customer(self):
payload = {**self.payload, 'customer': 999}
response = self.client.post('/api/v1/receipt-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
def test_review_receipt_order(self):
resp = self.client.post('/api/v1/receipt-orders/', self.payload, format='json')
order_id = resp.data['id']
response = self.client.post(
f'/api/v1/receipt-orders/{order_id}/review/',
{'action': 'cancel'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['status'], business_models.ReceiptOrderStatusEnum.CANCELLED)
def test_receipt_order_requires_amount(self):
payload = {**self.payload}
payload.pop('amount')
response = self.client.post('/api/v1/receipt-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('缺少 amount', response.data['error'])
def test_receipt_order_amount_must_be_positive(self):
payload = {**self.payload, 'amount': '0'}
response = self.client.post('/api/v1/receipt-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('amount 必须大于 0', response.data['error'])
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,
CELERY_TASK_EAGER_PROPAGATES=True,

6
api_v1/urls.py
View File

@@ -12,6 +12,8 @@ from .views import (
)
from .business.purchase import views as purchase_views
from .business.sales import views as sales_views
from .business.payment import views as payment_views
from .business.receipt import views as receipt_views
from .views.stock_change_views.snapshot import StockSnapshotListView
from .views.printing.views import PrintingOrderViewSet, PrintingJobViewSet, PlateOrderViewSet
from .views.upload import UploadFileViewSet
@@ -63,6 +65,10 @@ urlpatterns = [
path('purchase-orders/<int:pk>/review/', purchase_views.PurchaseOrderReviewView.as_view(), name='purchase_order_review'),
path('sales-orders/', sales_views.SalesOrderView.as_view(), name='sales_orders'),
path('sales-orders/<int:pk>/review/', sales_views.SalesOrderReviewView.as_view(), name='sales_order_review'),
path('payment-orders/', payment_views.PaymentOrderView.as_view(), name='payment_orders'),
path('payment-orders/<int:pk>/review/', payment_views.PaymentOrderReviewView.as_view(), name='payment_order_review'),
path('receipt-orders/', receipt_views.ReceiptOrderView.as_view(), name='receipt_orders'),
path('receipt-orders/<int:pk>/review/', receipt_views.ReceiptOrderReviewView.as_view(), name='receipt_order_review'),
path('health/', healthy.HealthCheckView.as_view(), name='health_check'),
path('print-count/delta/', print_count.adjust_print_count, name='print_count_delta'),