|
@@ -10,6 +10,7 @@ from urllib.parse import quote, parse_qs, unquote
|
|
|
|
|
|
import paypalrestsdk
|
|
import paypalrestsdk
|
|
from django.db import transaction
|
|
from django.db import transaction
|
|
|
|
+from django.db.models import Q
|
|
from django.http import HttpResponse, HttpResponseRedirect
|
|
from django.http import HttpResponse, HttpResponseRedirect
|
|
from django.views import View
|
|
from django.views import View
|
|
|
|
|
|
@@ -59,7 +60,7 @@ class IcloudMeal(View):
|
|
return response.json(414)
|
|
return response.json(414)
|
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
- def get_meal(request_dict, response):
|
|
|
|
|
|
+ def get_meal(request_dict, response, user_id):
|
|
"""
|
|
"""
|
|
获取套餐
|
|
获取套餐
|
|
@param request_dict: 请求参数
|
|
@param request_dict: 请求参数
|
|
@@ -68,10 +69,12 @@ class IcloudMeal(View):
|
|
@return: response
|
|
@return: response
|
|
"""
|
|
"""
|
|
lang = request_dict.get('lang', 'en')
|
|
lang = request_dict.get('lang', 'en')
|
|
- cloud_drive_qs = ICloudStoreMeal.objects.filter(lang__lang=lang).values('currency', 'symbol', 'price', 'expire',
|
|
|
|
- 'pay_type',
|
|
|
|
- 'size', 'bucket_id', 'lang__title',
|
|
|
|
- 'lang__content', 'sort').order_by(
|
|
|
|
|
|
+ # 隐藏的、删除的套餐不查
|
|
|
|
+ cloud_drive_qs = ICloudStoreMeal.objects.filter(Q(lang__lang=lang), Q(is_show=1), Q(is_delete=0)).values(
|
|
|
|
+ 'currency', 'symbol', 'price', 'expire',
|
|
|
|
+ 'pay_type',
|
|
|
|
+ 'size', 'bucket_id', 'lang__title',
|
|
|
|
+ 'lang__content', 'sort').order_by(
|
|
'sort')
|
|
'sort')
|
|
try:
|
|
try:
|
|
store_list = list(cloud_drive_qs)
|
|
store_list = list(cloud_drive_qs)
|