Return franchiser_name/clerk_name when duplicate upload
Brightcells
1 mainītis faili ar 15 papildinājumiem un 4 dzēšanām
+ 15
- 4
page/sale_views.py
@@ -9,7 +9,7 @@ from django_logit import logit |
||
| 9 | 9 |
from django_response import response |
| 10 | 10 |
from paginator import pagination |
| 11 | 11 |
|
| 12 |
-from account.models import SaleclerkInfo, UserInfo |
|
| 12 |
+from account.models import FranchiserInfo, SaleclerkInfo, UserInfo |
|
| 13 | 13 |
from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo |
| 14 | 14 |
from mch.models import ModelInfo |
| 15 | 15 |
from product.models import ProductCodeSubmitLogInfo, ProductInfo, ProductModelInfo |
@@ -73,11 +73,22 @@ def clerk_sale_submit_api(request): |
||
| 73 | 73 |
test_user=clerk.test_user, |
| 74 | 74 |
) |
| 75 | 75 |
|
| 76 |
- if SaleclerkIntegralIncomeExpensesInfo.objects.filter(code=serialNo, status=True).exists(): |
|
| 77 |
- return response(SaleclerkStatusCode.DUPLICATE_SUBMIT) |
|
| 76 |
+ try: |
|
| 77 |
+ sci = SaleclerkIntegralIncomeExpensesInfo.objects.get(code=serialNo, status=True) |
|
| 78 |
+ except SaleclerkIntegralIncomeExpensesInfo.DoesNotExist: |
|
| 79 |
+ sci = None |
|
| 80 |
+ |
|
| 81 |
+ if sci: |
|
| 82 |
+ try: |
|
| 83 |
+ clerk = SaleclerkInfo.objects.get(clerk_id=sci.clerk_id, status=True) |
|
| 84 |
+ except SaleclerkInfo.DoesNotExist: |
|
| 85 |
+ clerk = None |
|
| 86 |
+ return response(SaleclerkStatusCode.DUPLICATE_SUBMIT, data={
|
|
| 87 |
+ 'franchiser_name': clerk.franchiser_name, |
|
| 88 |
+ 'clerk_name': clerk.clerk_name, |
|
| 89 |
+ } if clerk else {})
|
|
| 78 | 90 |
|
| 79 | 91 |
# 店员积分 |
| 80 |
- # TODO： 序列号 vs. 积分 |
|
| 81 | 92 |
try: |
| 82 | 93 |
model = ModelInfo.objects.get(ModelID=ModelID) |
| 83 | 94 |
except ModelInfo.DoesNotExist: |