|
|
@@ -76,7 +76,7 @@ def exec_del_clerk_sale_submit(pk, admin_id):
|
76
|
76
|
admin_id=admin_id,
|
77
|
77
|
log_pk=pk,
|
78
|
78
|
model_name=model.model_name,
|
79
|
|
- code=model.code
|
|
79
|
+ code=ssli.code
|
80
|
80
|
)
|
81
|
81
|
|
82
|
82
|
# 日销量统计
|
|
|
@@ -230,8 +230,10 @@ def del_clerk_sale_submit_api(request):
|
230
|
230
|
admin_id = request.POST.get('admin_id', '')
|
231
|
231
|
pk = int(request.POST.get('pk', ''))
|
232
|
232
|
|
233
|
|
- if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
|
234
|
|
- return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
|
|
233
|
+ try:
|
|
234
|
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
235
|
+ except AdministratorInfo.DoesNotExist:
|
|
236
|
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
235
|
237
|
|
236
|
238
|
exec_del_clerk_sale_submit(pk, admin_id)
|
237
|
239
|
|
|
|
@@ -242,10 +244,12 @@ def del_clerk_sale_submit_api(request):
|
242
|
244
|
def batch_del_clerk_sale_submit_api(request):
|
243
|
245
|
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
244
|
246
|
admin_id = request.POST.get('admin_id', '')
|
245
|
|
- pk = json.loads(request.POST.get('pks', []))
|
|
247
|
+ pks = json.loads(request.POST.get('pks', []))
|
246
|
248
|
|
247
|
|
- if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
|
248
|
|
- return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
|
|
249
|
+ try:
|
|
250
|
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
251
|
+ except AdministratorInfo.DoesNotExist:
|
|
252
|
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
249
|
253
|
|
250
|
254
|
for pk in pks:
|
251
|
255
|
exec_del_clerk_sale_submit(pk, admin_id)
|
|
|
@@ -292,7 +296,7 @@ def exec_del_consumer_submit(pk, admin_id):
|
292
|
296
|
admin_id=admin_id,
|
293
|
297
|
log_pk=pk,
|
294
|
298
|
model_name=model.model_name,
|
295
|
|
- code=model.code
|
|
299
|
+ code=ssli.serialNo
|
296
|
300
|
)
|
297
|
301
|
|
298
|
302
|
# 消除用户劵
|
|
|
@@ -480,8 +484,10 @@ def del_consumer_submit_api(request):
|
480
|
484
|
admin_id = request.POST.get('admin_id', '')
|
481
|
485
|
pk = int(request.POST.get('pk', ''))
|
482
|
486
|
|
483
|
|
- if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
|
484
|
|
- return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
|
|
487
|
+ try:
|
|
488
|
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
489
|
+ except AdministratorInfo.DoesNotExist:
|
|
490
|
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
485
|
491
|
|
486
|
492
|
exec_del_consumer_submit(pk, admin_id)
|
487
|
493
|
|
|
|
@@ -493,10 +499,12 @@ def del_consumer_submit_api(request):
|
493
|
499
|
def batch_del_consumer_submit_api(request):
|
494
|
500
|
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
495
|
501
|
admin_id = request.POST.get('admin_id', '')
|
496
|
|
- pk = json.loads(request.POST.get('pks', []))
|
|
502
|
+ pks = json.loads(request.POST.get('pks', []))
|
497
|
503
|
|
498
|
|
- if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
|
499
|
|
- return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
|
|
504
|
+ try:
|
|
505
|
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
506
|
+ except AdministratorInfo.DoesNotExist:
|
|
507
|
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
500
|
508
|
|
501
|
509
|
for pk in pks:
|
502
|
510
|
exec_del_consumer_submit(pk, admin_id)
|