Merge branch 'dev' into lang

Controller/CDKController.py

@@ -38,7 +38,7 @@ from Object.UidTokenObject import UidTokenObject
 from Service.CommonService import CommonService
 from Object.m3u8generate import PlaylistGenerator
 from Object.WechatPayObject import WechatPayObject
-from django.db.models import Q
+from django.db.models import Q, F
 from django.http import StreamingHttpResponse
 
 SERVER_DOMAIN = 'http://test.dvema.com/'
@@ -115,7 +115,7 @@ class CDKView(View):
         cdk = request_dict.get('cdk', None)
         order = request_dict.get('order', None)
         is_activate = request_dict.get('is_activate', None)
-
+        lang = request_dict.get('lang', None)
         searchVal = ''
         if cdk:
             searchVal = cdk.strip()
@@ -133,6 +133,12 @@ class CDKView(View):
                     cdk_qs = cdk_qs.filter(order=searchVal)
                 elif is_activate:
                     cdk_qs = cdk_qs.filter(is_activate=searchVal)
+
+            if not lang:
+                lang = 'cn'
+
+            cdk_qs = cdk_qs.filter(rank__lang__lang=lang)
+            cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
             cdk_qs = cdk_qs.values('id', 'cdk', 'create_time', 'valid_time', 'is_activate', 'rank__id', 'rank__title', 'order',
                                    'create_time')
             cdk_qs = cdk_qs.order_by('-create_time')  # 根据CDK创建时间降序排序
@@ -155,6 +161,7 @@ class CDKView(View):
 
     def deleteCDK(self, request_dict, response):
         cdk_id = request_dict.get("id", None)
+        lang = request_dict.get("lang", None)
         try:
             CDKcontextModel.objects.get(cdk=cdk_id).delete()
         except Exception as e:
@@ -184,6 +191,12 @@ class CDKView(View):
                         cdk_qs = cdk_qs.filter(order=searchVal)
                     elif is_activate:
                         cdk_qs = cdk_qs.filter(is_activate=searchVal)
+
+                if not lang:
+                    lang = 'cn'
+
+                cdk_qs = cdk_qs.filter(rank__lang__lang=lang)
+                cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
                 cdk_qs = cdk_qs.values('id', 'cdk', 'create_time', 'valid_time', 'is_activate', 'rank__id',
                                        'rank__title', 'order',
                                        'create_time')

Controller/MealManage.py

@@ -13,6 +13,7 @@
 """
 import traceback
 
+from django.db.models import F
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
@@ -132,13 +133,18 @@ class MealManage(View):
 
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
+        lang = request_dict.get('lang', None)
         if page is None or line is None:
             return response.json(444)
+        if not lang:
+            lang = 'cn'
 
-        qs = Store_Meal.objects.values("id", "price", "day", "add_time", "update_time", "currency"
+        qs = Store_Meal.objects.filter(lang__lang=lang)
+        qs = qs.annotate(title=F('lang__title'),content=F('lang__content'))
+        qs = qs.values("id", "price", "day", "add_time", "update_time", "currency"
                                        , "bucket_id", "commodity_type", "commodity_code", "virtual_price", "is_discounts"
                                        , "discount_price", "expire", "symbol"
-                                       , "bucket__bucket", "bucket__area", "bucket__storeDay")
+                                       , "bucket__bucket", "bucket__area", "bucket__storeDay", "title")
         res = {}
         if qs.exists():
             ql = list(qs)

Controller/OrderContrller.py

@@ -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})