|
|
@@ -17,8 +17,9 @@ from django.views.decorators.csrf import csrf_exempt
|
|
|
from django.views.generic.base import View
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
-from Model.models import Order_Model,Device_Info
|
|
|
+from Model.models import Order_Model, Device_Info
|
|
|
import time
|
|
|
+
|
|
|
'''
|
|
|
# 获取所有设备下单信息
|
|
|
http://192.168.136.40:8077/order/querylist?token=local&page=1&line=10
|
|
|
@@ -80,8 +81,9 @@ class OrderView(View):
|
|
|
omqs.order_by()
|
|
|
count = omqs.count()
|
|
|
order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "addTime",
|
|
|
- "updTime", "paypal", "rank__day", "rank__price","status",
|
|
|
- "rank__content", "rank__title","rank__currency")
|
|
|
+ "updTime", "endTime", "paypal", "rank__day",
|
|
|
+ "rank__price", "status",
|
|
|
+ "rank__content", "rank__title", "rank__currency")
|
|
|
order_list = list(order_ql)
|
|
|
data = []
|
|
|
nowTime = int(time.time())
|
|
|
@@ -94,12 +96,12 @@ class OrderView(View):
|
|
|
if did:
|
|
|
d['did'] = did
|
|
|
else:
|
|
|
- didqs = Device_Info.objects.filter(userID_id=userID,UID=d['UID']).values('id')
|
|
|
+ didqs = Device_Info.objects.filter(userID_id=userID, UID=d['UID']).values('id')
|
|
|
if didqs.exists():
|
|
|
did = didqs[0]['id']
|
|
|
else:
|
|
|
did = ''
|
|
|
d['did'] = did
|
|
|
- d['endTime'] = int(d['updTime'])+int(d['rank__day']*86400)
|
|
|
+ # d['endTime'] = int(d['updTime'])+int(d['rank__day']*86400)
|
|
|
data.append(d)
|
|
|
return response.json(0, {'data': data, 'count': count})
|
chenjunkai