|
|
@@ -15,10 +15,9 @@
|
|
|
from django.utils.decorators import method_decorator
|
|
|
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 Store_Meal, Order_Model
|
|
|
+from Model.models import Order_Model,Device_Info
|
|
|
import time
|
|
|
'''
|
|
|
# 获取所有设备下单信息
|
|
|
@@ -62,13 +61,21 @@ class OrderView(View):
|
|
|
def do_querylist(self, request_dict, userID, response):
|
|
|
page = request_dict.get('page', None)
|
|
|
line = request_dict.get('line', None)
|
|
|
+ did = request_dict.get('did', None)
|
|
|
if not page or not line:
|
|
|
return response.json(444, 'page,line')
|
|
|
page = int(page)
|
|
|
line = int(line)
|
|
|
omqs = Order_Model.objects.filter(userID_id=userID)
|
|
|
+ # 筛选指定设备id的订单
|
|
|
+ if did:
|
|
|
+ dvqs = Device_Info.objects.filter(id=did).values('UID')
|
|
|
+ if dvqs.exists():
|
|
|
+ omqs.filter(UID=dvqs[0]['UID'])
|
|
|
if not omqs.exists():
|
|
|
return response.json(10, '订单不存在')
|
|
|
+ if did:
|
|
|
+ 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",
|
chenjunkai