套餐语言8

Controller/OrderContrller.py

@@ -91,11 +91,12 @@ class OrderView(View):
         page = request_dict.get('page', None)
         line = request_dict.get('line', None)
         uid = request_dict.get('uid', None)
+        lang = request_dict.get('lang', 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, status=1)
+        omqs = Order_Model.objects.filter(userID_id=userID, status=1, rank__lang__lang=lang)
         # 筛选指定设备id的订单
         if uid:
             omqs.filter(UID=uid)
@@ -141,6 +142,7 @@ 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)
@@ -149,7 +151,7 @@ class OrderView(View):
             orderID = request_dict.get('orderID', None)
             page = int(page)
             line = int(line)
-            omqs = Order_Model.objects.filter()
+            omqs = Order_Model.objects.filter(rank__lang__lang=lang)
             # 筛选指定设备id的订单
             if uid:
                 omqs = omqs.filter(UID=uid)
@@ -178,16 +180,16 @@ class OrderView(View):
         status = request_dict.get('status', None)
         page = request_dict.get('page', None)
         line = request_dict.get('line', None)
-
+        lang = request_dict.get('lang',None)
         if status and page and line:
             order_qs = None
             status = int(status)
             if status == -1: # 获取所有订单
-                order_qs = Order_Model.objects.filter(userID__userID=userID)
+                order_qs = Order_Model.objects.filter(userID__userID=userID,rank__lang__lang=lang)
             elif status == 0: # 获取【代付款】订单
-                order_qs = Order_Model.objects.filter(userID__userID=userID, status=0)
+                order_qs = Order_Model.objects.filter(userID__userID=userID, status=0,rank__lang__lang=lang)
             elif status == 1:
-                order_qs = Order_Model.objects.filter(userID__userID=userID, status=1)
+                order_qs = Order_Model.objects.filter(userID__userID=userID, status=1,rank__lang__lang=lang)
 
             if order_qs is None or not order_qs.exists():
                 return response.json(0, {'data': [], 'count': 0})
@@ -207,9 +209,9 @@ class OrderView(View):
 
     def do_query_order_detail(self, request_dict, userID, response):
         orderID = request_dict.get('orderID', None)
-
+        lang = request_dict.get('lang', None)
         if orderID:
-            order_qs = Order_Model.objects.filter(orderID=orderID, userID__userID=userID)
+            order_qs = Order_Model.objects.filter(orderID=orderID, userID__userID=userID, rank__lang__lang=lang)
             if order_qs.exists():
                 print(order_qs)
                 order_qs = order_qs.annotate(rank__title=F('rank__lang__title'))
@@ -225,11 +227,11 @@ class OrderView(View):
 
     def do_cancel_order(self, request_dict, userID, response):
         orderID = request_dict.get('orderID', None)
-
+        lang = request_dict.get('lang', None)
         if orderID is None:
             return response.json(444)
 
-        order_qs = Order_Model.objects.filter(orderID=orderID)
+        order_qs = Order_Model.objects.filter(orderID=orderID,rank__lang__lang=lang)
         if not order_qs.exists():
             return response.json(800)