|
@@ -133,7 +133,7 @@ class SerialNumberView(View):
|
|
token = request_dict.get('token', None)
|
|
token = request_dict.get('token', None)
|
|
time_stamp = request_dict.get('time_stamp', None)
|
|
time_stamp = request_dict.get('time_stamp', None)
|
|
DeviceSubType = request_dict.get('DeviceSubType', None)
|
|
DeviceSubType = request_dict.get('DeviceSubType', None)
|
|
-
|
|
|
|
|
|
+ p2ptype = request_dict.get('p2ptype', 1)
|
|
if not all([serial_number, company_id, token, time_stamp]):
|
|
if not all([serial_number, company_id, token, time_stamp]):
|
|
return response.json(444)
|
|
return response.json(444)
|
|
|
|
|
|
@@ -148,9 +148,9 @@ class SerialNumberView(View):
|
|
|
|
|
|
serial = serial_number[0:6]
|
|
serial = serial_number[0:6]
|
|
full_serial = serial_number[0:9]
|
|
full_serial = serial_number[0:9]
|
|
- p2p = 1
|
|
|
|
|
|
+
|
|
if serial_number[9:10]:
|
|
if serial_number[9:10]:
|
|
- p2p = serial_number[9:10]
|
|
|
|
|
|
+ p2ptype = serial_number[9:10]
|
|
try:
|
|
try:
|
|
if not country_id:
|
|
if not country_id:
|
|
ip = CommonService.get_ip_address(request)
|
|
ip = CommonService.get_ip_address(request)
|
|
@@ -172,7 +172,7 @@ class SerialNumberView(View):
|
|
while count < 3:
|
|
while count < 3:
|
|
# 查询是否存在未绑定序列号的uid
|
|
# 查询是否存在未绑定序列号的uid
|
|
uid_qs = UIDModel.objects.filter(vpg__company_id=company_serial.company.id,
|
|
uid_qs = UIDModel.objects.filter(vpg__company_id=company_serial.company.id,
|
|
- vpg__region_id=country_id, status=0, p2p_type=p2p). \
|
|
|
|
|
|
+ vpg__region_id=country_id, status=0, p2p_type=p2ptype). \
|
|
order_by('id')
|
|
order_by('id')
|
|
if not uid_qs.exists():
|
|
if not uid_qs.exists():
|
|
return response.json(173)
|
|
return response.json(173)
|