|
|
@@ -142,7 +142,6 @@ class OrderView(View):
|
|
|
|
|
|
def do_admin_query(self, request_dict, userID, response):
|
|
|
own_perm = ModelService.check_perm(userID, 20)
|
|
|
- lang = request_dict.get('lang',None)
|
|
|
if own_perm is True:
|
|
|
page = request_dict.get('page', None)
|
|
|
line = request_dict.get('line', None)
|
|
|
@@ -151,7 +150,7 @@ class OrderView(View):
|
|
|
orderID = request_dict.get('orderID', None)
|
|
|
page = int(page)
|
|
|
line = int(line)
|
|
|
- omqs = Order_Model.objects.filter(rank__lang__lang=lang)
|
|
|
+ omqs = Order_Model.objects.all()
|
|
|
# 筛选指定设备id的订单
|
|
|
if uid:
|
|
|
omqs = omqs.filter(UID=uid)
|
|
|
@@ -162,14 +161,11 @@ class OrderView(View):
|
|
|
if not omqs.exists():
|
|
|
return response.json(0, [])
|
|
|
count = omqs.count()
|
|
|
- omqs = omqs.annotate(rank__title=F('rank__lang__title'), rank__content=F('rank__lang__content'))
|
|
|
order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price",
|
|
|
"currency", "addTime", "updTime", "paypal",
|
|
|
"payType",
|
|
|
"rank__day",
|
|
|
- "rank__price", "status",
|
|
|
- "rank__content", "rank__title", "rank__currency",
|
|
|
- "rank_id")
|
|
|
+ "rank__price", "status")
|
|
|
order_list = list(order_ql)
|
|
|
return response.json(0, {'data': order_list, 'count': count})
|
|
|
|
chenshibin