|
@@ -110,6 +110,7 @@ class SerialNumberView(View):
|
|
|
serial_number = request_dict.get('serial_number', None)
|
|
|
token = request_dict.get('token', None)
|
|
|
time_stamp = request_dict.get('time_stamp', None)
|
|
|
+ is_verify = request_dict.get('is_verify', None)
|
|
|
|
|
|
if not all([serial_number, token, time_stamp]):
|
|
|
return response.json(444)
|
|
@@ -149,13 +150,16 @@ class SerialNumberView(View):
|
|
|
if company_serial.status == 0: # 该序列号未绑定企业
|
|
|
return response.json(173)
|
|
|
elif company_serial.status == 1: # 绑定uid
|
|
|
-
|
|
|
- # 查询app是否已扫码,未扫码不能进行绑定
|
|
|
- app_scanned_serial_qs = AppScannedSerial.objects.filter(serial=serial).values('region_country')
|
|
|
- if not app_scanned_serial_qs.exists():
|
|
|
- LOGGER.info(f'{serial}当前序列号未进行APP扫码')
|
|
|
- return response.json(5)
|
|
|
- region_country = app_scanned_serial_qs[0]['region_country']
|
|
|
+ # is_verify: '1',跳过查询扫码记录
|
|
|
+ if is_verify == '1':
|
|
|
+ region_country = 0
|
|
|
+ else:
|
|
|
+ # 查询app是否已扫码,未扫码不能进行绑定
|
|
|
+ app_scanned_serial_qs = AppScannedSerial.objects.filter(serial=serial).values('region_country')
|
|
|
+ if not app_scanned_serial_qs.exists():
|
|
|
+ LOGGER.info(f'{serial}当前序列号未进行APP扫码')
|
|
|
+ return response.json(5)
|
|
|
+ region_country = app_scanned_serial_qs[0]['region_country']
|
|
|
|
|
|
# redis加锁,防止同一个序列号重复绑定
|
|
|
key = serial + 'do_attach_uid'
|