|
@@ -220,8 +220,11 @@ class CloudStorageView(View):
|
|
|
store_qs = Store_Meal.objects.filter(Q(lang__lang=lang), Q(is_show=0), ~Q(pay_type='11')) # 过滤激活码、隐藏套餐
|
|
|
experience_context_qs = ExperienceContextModel.objects.filter(uid=uid, experience_type=0)
|
|
|
|
|
|
+ ios_meal = None
|
|
|
if mold:
|
|
|
store_qs = store_qs.filter(bucket__mold=mold)
|
|
|
+ if uid in ['5Z1LZLK7D5Y6WKDE111A','7ZB7V8B5LA48K1MC111A','4XES12WGN9D9KLEJ111A']:
|
|
|
+ ios_meal = store_qs # 提审测试UID
|
|
|
|
|
|
# 没体验过的设备只返回体验套餐,体验过的不返回体验套餐
|
|
|
if experience_context_qs.exists():
|
|
@@ -259,6 +262,9 @@ class CloudStorageView(View):
|
|
|
is_ai = 1 if is_ai != 2 and CONFIG_INFO != CONFIG_CN else 0 # 国内不支持AI服务
|
|
|
store_qs = store_qs.filter(pay_type='10') # 体验套餐不区分像素等级
|
|
|
|
|
|
+ if ios_meal: # 所有IOS提审要用
|
|
|
+ store_qs = ios_meal.filter(app_type=app_type)
|
|
|
+
|
|
|
store_qs = store_qs.annotate(title=F('lang__title'), content=F('lang__content'),
|
|
|
new_title=F('lang__new_title'), discount_content=F('lang__discount_content'))
|
|
|
store_qs = store_qs.order_by('sort').values("id", "title", "content", "price", "day", "currency",
|
|
@@ -306,7 +312,7 @@ class CloudStorageView(View):
|
|
|
item['isCoupon'] = False
|
|
|
else:
|
|
|
# 在列表删除这个套餐
|
|
|
- if self.check_combo_is_coupon(item['id']):
|
|
|
+ if self.check_combo_is_coupon(item['id']) and ios_meal is None:
|
|
|
items_list.remove(item)
|
|
|
|
|
|
res_c = {'area': area, 'items': items_list}
|