|
|
@@ -69,12 +69,22 @@ def usecoupon(request):
|
69
|
69
|
if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
70
|
70
|
return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
71
|
71
|
|
72
|
|
- if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
|
|
72
|
+ if not AdministratorInfo.objects.filter(
|
|
73
|
+ admin_id=admin_id,
|
|
74
|
+ admin_type=AdministratorInfo.MAINTENANCE,
|
|
75
|
+ user_status=AdministratorInfo.ACTIVATED,
|
|
76
|
+ status=True
|
|
77
|
+ ).exists():
|
73
|
78
|
return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
|
74
|
79
|
|
75
|
|
- try:
|
76
|
|
- log = ConsumeInfoSubmitLogInfo.objects.get(brand_id=brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True, has_used=False)
|
77
|
|
- except ConsumeInfoSubmitLogInfo.DoesNotExist:
|
|
80
|
+ log = ConsumeInfoSubmitLogInfo.objects.filter(
|
|
81
|
+ brand_id=brand_id,
|
|
82
|
+ model_id=model_id,
|
|
83
|
+ serialNo=sn,
|
|
84
|
+ submit_during_activity=True,
|
|
85
|
+ has_used=False
|
|
86
|
+ ).first()
|
|
87
|
+ if not log:
|
78
|
88
|
return response(ProductMachineStatusCode.SN_NOT_FOUND)
|
79
|
89
|
|
80
|
90
|
logdata = log.data
|