|
@@ -68,7 +68,7 @@ class OrderView(View):
|
|
|
return response.json(444, 'page,line')
|
|
|
page = int(page)
|
|
|
line = int(line)
|
|
|
- omqs = Order_Model.objects.filter(userID_id=userID)
|
|
|
+ omqs = Order_Model.objects.filter(userID_id=userID, status=1)
|
|
|
# 筛选指定设备id的订单
|
|
|
if did:
|
|
|
dvqs = Device_Info.objects.filter(id=did).values('UID')
|
|
@@ -94,7 +94,7 @@ class OrderView(View):
|
|
|
uid_list = []
|
|
|
for od in order_list:
|
|
|
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')
|
|
|
for d in order_list:
|
|
|
if d['status'] == 0:
|
|
|
if d['addTime'] + 3600 < nowTime:
|