Browse Source

套餐语言传参,如果为空,默认为:en

chenshibin 4 năm trước cách đây
mục cha
commit
635af10f20
3 tập tin đã thay đổi với 11 bổ sung11 xóa
  1. 6 6
      Controller/CloudStorage.py
  2. 1 1
      Controller/CloudVod.py
  3. 4 4
      Controller/OrderContrller.py

+ 6 - 6
Controller/CloudStorage.py

@@ -208,7 +208,7 @@ class CloudStorageView(View):
     def do_commodity_list(self, request_dict, userID, response):
         mold = request_dict.get('mold', None)
         uid = request_dict.get('uid', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
         qs = Store_Meal.objects
         eq = ExperienceContextModel.objects.filter(uid=uid, experience_type=0).values('id')
         # userqs = Device_User.objects.filter(userID=userID).values('is_experience')
@@ -739,7 +739,7 @@ class CloudStorageView(View):
     def do_pay_ok(self, request_dict):
         response = HttpResponse()
         paytype = request_dict.get('paytype', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
 
         showtitle = "支付成功"
         if paytype == "10" :
@@ -932,7 +932,7 @@ class CloudStorageView(View):
         paymentId = request_dict.get('paymentId', None)
         PayerID = request_dict.get('PayerID', None)
         orderID = request_dict.get('orderID', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
         try:
             order_qs = Order_Model.objects.filter(orderID=orderID, status=0)
 
@@ -1117,7 +1117,7 @@ class CloudStorageView(View):
         pay_type = int(request_dict.get('pay_type', None))
         rank = request_dict.get('rank', None)
         is_select_discount = request_dict.get('is_select_discount', 0)
-        lang = request_dict.get('lang', 0)
+        lang = request_dict.get('lang', 'en')
         if not uid or not channel or not pay_type or not rank:
             return response.json(444)
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1).values(
@@ -1282,7 +1282,7 @@ class CloudStorageView(View):
         pay_type = int(request_dict.get('pay_type', None))
         rank = request_dict.get('rank', None)
         cdk = request_dict.get('cdk', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
         if cdk != None and pay_type == 11:
             cdk_qs = CDKcontextModel.objects.filter(cdk=cdk).values('is_activate', 'rank__id', 'rank__commodity_code')
             if not cdk_qs.exists():
@@ -1436,7 +1436,7 @@ class CloudStorageView(View):
     # 设备关联套餐列表
     def device_commodity(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1) \
             .values('vodPrimaryUserID')
         if not dv_qs.exists() or dv_qs[0]['vodPrimaryUserID'] != userID:

+ 1 - 1
Controller/CloudVod.py

@@ -714,7 +714,7 @@ class CloudVodView(View):
 
     def do_pay_status(self, request_dict, userID, response):
         orderID = request_dict.get('orderID', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
         om_qs = Order_Model.objects.filter(orderID=orderID).values('status')
         # response = HttpResponse()
         # success_pay_content = '''

+ 4 - 4
Controller/OrderContrller.py

@@ -91,7 +91,7 @@ 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)
+        lang = request_dict.get('lang', 'en')
         if not page or not line:
             return response.json(444, 'page,line')
         page = int(page)
@@ -176,7 +176,7 @@ 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)
+        lang = request_dict.get('lang', 'en')
         if status and page and line:
             order_qs = None
             status = int(status)
@@ -205,7 +205,7 @@ 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)
+        lang = request_dict.get('lang', 'en')
         if orderID:
             order_qs = Order_Model.objects.filter(orderID=orderID, userID__userID=userID, rank__lang__lang=lang)
             if order_qs.exists():
@@ -223,7 +223,7 @@ class OrderView(View):
 
     def do_cancel_order(self, request_dict, userID, response):
         orderID = request_dict.get('orderID', None)
-        lang = request_dict.get('lang', None)
+        lang = request_dict.get('lang', 'en')
         if orderID is None:
             return response.json(444)