|
@@ -19,7 +19,7 @@ from django.views.generic.base import View
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
from Model.models import Store_Meal, Order_Model
|
|
from Model.models import Store_Meal, Order_Model
|
|
-
|
|
|
|
|
|
+import time
|
|
'''
|
|
'''
|
|
# 获取所有设备下单信息
|
|
# 获取所有设备下单信息
|
|
http://192.168.136.40:8077/order/querylist?token=local&page=1&line=10
|
|
http://192.168.136.40:8077/order/querylist?token=local&page=1&line=10
|
|
@@ -71,7 +71,14 @@ class OrderView(View):
|
|
return response.json(10, '订单不存在')
|
|
return response.json(10, '订单不存在')
|
|
count = omqs.count()
|
|
count = omqs.count()
|
|
order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "addTime",
|
|
order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "addTime",
|
|
- "updTime", "paypal", "rank__day", "rank__price",
|
|
|
|
|
|
+ "updTime", "paypal", "rank__day", "rank__price","status",
|
|
"rank__content", "rank__title","rank__currency")
|
|
"rank__content", "rank__title","rank__currency")
|
|
- data = list(order_ql)
|
|
|
|
|
|
+ order_list = list(order_ql)
|
|
|
|
+ data = []
|
|
|
|
+ nowTime = int(time.time())
|
|
|
|
+ for d in order_list:
|
|
|
|
+ if d['addTime']+3600 < nowTime:
|
|
|
|
+ d['status'] = 3
|
|
|
|
+ data.append(d)
|
|
|
|
+
|
|
return response.json(0, {'data': data, 'count': count})
|
|
return response.json(0, {'data': data, 'count': count})
|