|
@@ -118,7 +118,7 @@ class OrderView(View):
|
|
uid_list = []
|
|
uid_list = []
|
|
for od in order_list:
|
|
for od in order_list:
|
|
uid_list.append(od['UID'])
|
|
uid_list.append(od['UID'])
|
|
- didqs = Device_Info.objects.filter(userID_id=userID, UID__in=uid_list).values('id', 'UID', 'Type')
|
|
|
|
|
|
+ didqs = Device_Info.objects.filter(userID_id=userID, UID__in=uid_list).values('id', 'UID', 'Type', 'serial_number')
|
|
for d in order_list:
|
|
for d in order_list:
|
|
if d['status'] == 0:
|
|
if d['status'] == 0:
|
|
if d['addTime'] + 3600 < nowTime:
|
|
if d['addTime'] + 3600 < nowTime:
|
|
@@ -127,6 +127,7 @@ class OrderView(View):
|
|
if d['UID'] == did['UID']:
|
|
if d['UID'] == did['UID']:
|
|
d['did'] = did['id']
|
|
d['did'] = did['id']
|
|
d['Type'] = did['Type']
|
|
d['Type'] = did['Type']
|
|
|
|
+ d['serialNumber'] = did['serial_number']
|
|
data.append(d)
|
|
data.append(d)
|
|
d['rank__content'] = d['rank__lang__content']
|
|
d['rank__content'] = d['rank__lang__content']
|
|
del d['rank__lang__content']
|
|
del d['rank__lang__content']
|